mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-04 15:18:05 +01:00
Code Issues Projects Releases Wiki Activity

ci: Move git config commands into script where they are used

Browse source
This commit is contained in:
Hennadii Stepanov 2022-10-03 18:51:56 +01:00
parent 1730f6cb23
commit ac1d99240a
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.cirrus.yml
View file

@ -24,11 +24,8 @@ filter_template: &FILTER_TEMPLATE
base_template: &BASE_TEMPLATE base_template: &BASE_TEMPLATE
<< : *FILTER_TEMPLATE << : *FILTER_TEMPLATE
merge_base_script: merge_base_script:
# Unconditionally install git (used in fingerprint_script) and set the # Unconditionally install git (used in fingerprint_script).
# default git author name (used in verify-commits.py)
- bash -c "$PACKAGE_MANAGER_INSTALL git" - 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 - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge" - git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts - git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts

2
ci/lint/06_script.sh
View file

@ -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-sha512-root-commit
git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root
mapfile -t KEYS < contrib/verify-commits/trusted-keys 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[@]}" && ${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}" &&
./contrib/verify-commits/verify-commits.py; ./contrib/verify-commits/verify-commits.py;
fi fi