Skip to content

Commit ac1d992

Browse files
committed
ci: Move git config commands into script where they are used
1 parent 1730f6c commit ac1d992

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.cirrus.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,8 @@ filter_template: &FILTER_TEMPLATE
2424
base_template: &BASE_TEMPLATE
2525
<< : *FILTER_TEMPLATE
2626
merge_base_script:
27-
# Unconditionally install git (used in fingerprint_script) and set the
28-
# default git author name (used in verify-commits.py)
27+
# Unconditionally install git (used in fingerprint_script).
2928
- bash -c "$PACKAGE_MANAGER_INSTALL git"
30-
- git config --global user.email "[email protected]"
31-
- git config --global user.name "ci"
3229
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
3330
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
3431
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts

ci/lint/06_script.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t
3131
git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
3232
git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root
3333
mapfile -t KEYS < contrib/verify-commits/trusted-keys
34+
git config user.email "[email protected]"
35+
git config user.name "ci"
3436
${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}" &&
3537
./contrib/verify-commits/verify-commits.py;
3638
fi

0 commit comments

Comments
 (0)