diff --git a/.github/ci-lint-exec.py b/.github/ci-lint-exec.py index f0a6adcabca..73749accd6f 100755 --- a/.github/ci-lint-exec.py +++ b/.github/ci-lint-exec.py @@ -38,6 +38,8 @@ def main(): extra_env = [] if os.environ["GITHUB_EVENT_NAME"] == "pull_request": 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([ "docker", diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index 536427f1b45..82e499c29ba 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -18,7 +18,7 @@ fi 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, # 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