diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-10-03 18:51:56 +0100 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-11-01 12:52:04 +0000 |
| commit | 14784aa02c61ef71f028ef1e61e567d7131f79b9 (patch) | |
| tree | 88695deb53c5a735bd085961fa7523414f0b64d3 | |
| parent | b1268254bacabbd5e5c783dd06879ea96c327ad8 (diff) | |
ci: Move `git config` commands into script where they are used
Github-Pull: bitcoin/bitcoin#26236
Rebased-From: ac1d99240af6c5d3ed5db2beea1479903d949a37
| -rw-r--r-- | .cirrus.yml | 5 | ||||
| -rwxr-xr-x | ci/lint/06_script.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index de7b45c920..208a98ff35 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,11 +24,8 @@ filter_template: &FILTER_TEMPLATE base_template: &BASE_TEMPLATE << : *FILTER_TEMPLATE merge_base_script: - # Unconditionally install git (used in fingerprint_script) and set the - # default git author name (used in verify-commits.py) + # Unconditionally install git (used in fingerprint_script). - bash -c "$PACKAGE_MANAGER_INSTALL git" - - git config --global user.email "ci@ci.ci" - - git config --global user.name "ci" - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge" - git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index 1f14dd079f..4506848740 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -31,6 +31,8 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root mapfile -t KEYS < contrib/verify-commits/trusted-keys + git config user.email "ci@ci.ci" + git config user.name "ci" ${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}" && ./contrib/verify-commits/verify-commits.py; fi |