ci: Re-enable LINT_CI_SANITY_CHECK_COMMIT_SIG
With the move from cirrus-ci to GHA, the CIRRUS_REPO_FULL_NAME env var was always unset, never triggering the sanity check. Fix this by introducing a new vendor-agnostic env var and setting it properly.
This commit is contained in:
2 files changed
+3
-1
No files matched your search
@@ -38,6 +38,8 @@ def main():
|
|||||||
extra_env = []
|
extra_env = []
|
||||||
if os.environ["GITHUB_EVENT_NAME"] == "pull_request":
|
if os.environ["GITHUB_EVENT_NAME"] == "pull_request":
|
||||||
extra_env = ["--env", "LINT_CI_IS_PR=1"]
|
extra_env = ["--env", "LINT_CI_IS_PR=1"]
|
||||||
|
if os.environ["GITHUB_EVENT_NAME"] != "pull_request" and os.environ["GITHUB_REPOSITORY"] == "bitcoin/bitcoin":
|
||||||
|
extra_env = ["--env", "LINT_CI_SANITY_CHECK_COMMIT_SIG=1"]
|
||||||
|
|
||||||
run([
|
run([
|
||||||
"docker",
|
"docker",
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ fi
|
|||||||
|
|
||||||
RUST_BACKTRACE=1 cargo run --manifest-path "./test/lint/test_runner/Cargo.toml"
|
RUST_BACKTRACE=1 cargo run --manifest-path "./test/lint/test_runner/Cargo.toml"
|
||||||
|
|
||||||
if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "${LINT_CI_IS_PR}" = "" ] ; then
|
if [ "${LINT_CI_SANITY_CHECK_COMMIT_SIG}" = "1" ] ; then
|
||||||
# Sanity check only the last few commits to get notified of missing sigs,
|
# Sanity check only the last few commits to get notified of missing sigs,
|
||||||
# missing keys, or expired keys. Usually there is only one new merge commit
|
# missing keys, or expired keys. Usually there is only one new merge commit
|
||||||
# per push on the master branch and a few commits on release branches, so
|
# per push on the master branch and a few commits on release branches, so
|
||||||
|
|||||||
Reference in new issue
Block a user