File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -24,11 +24,8 @@ filter_template: &FILTER_TEMPLATE
24
24
base_template : &BASE_TEMPLATE
25
25
<< : *FILTER_TEMPLATE
26
26
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).
29
28
- bash -c "$PACKAGE_MANAGER_INSTALL git"
30
- -
git config --global user.email "[email protected] "
31
- - git config --global user.name "ci"
32
29
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
33
30
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
34
31
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts
Original file line number Diff line number Diff line change @@ -31,6 +31,8 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t
31
31
git log HEAD~10 -1 --format=' %H' > ./contrib/verify-commits/trusted-sha512-root-commit
32
32
git log HEAD~10 -1 --format=' %H' > ./contrib/verify-commits/trusted-git-root
33
33
mapfile -t KEYS < contrib/verify-commits/trusted-keys
34
+ git config user.email
" [email protected] "
35
+ git config user.name " ci"
34
36
${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys " ${KEYS[@]} " &&
35
37
./contrib/verify-commits/verify-commits.py;
36
38
fi
You can’t perform that action at this time.
0 commit comments