diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-11-01 18:22:34 +0100 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-11-01 18:22:53 +0100 |
| commit | ca5f8f0de2c6fcf2ac122bd7fbb5a685d5935f71 (patch) | |
| tree | 7c3e2a3fd525839858634e2c1fbaca816563595a /ci | |
| parent | 067dc42b7995d823666292929c760f7dda602cb7 (diff) | |
| parent | 7f2dc610a5ac68c915192bf5df5ad9e7177bf18e (diff) | |
| download | bitcoin-ca5f8f0de2c6fcf2ac122bd7fbb5a685d5935f71.tar.xz | |
Merge bitcoin/bitcoin#26436: [24.x] CI backports
7f2dc610a5ac68c915192bf5df5ad9e7177bf18e ci: Use same `merge_script` implementation for Windows as for all (Hennadii Stepanov)
14784aa02c61ef71f028ef1e61e567d7131f79b9 ci: Move `git config` commands into script where they are used (Hennadii Stepanov)
b1268254bacabbd5e5c783dd06879ea96c327ad8 ci: Use remote pull/merge ref instead of local git merge (MacroFake)
Pull request description:
This PR backports:
- https://github.com/bitcoin/bitcoin/pull/26202
- https://github.com/bitcoin/bitcoin/pull/26236
to avoid CI failures like that:
- https://cirrus-ci.com/task/5653459278495744
- https://cirrus-ci.com/task/6075671743561728
ACKs for top commit:
fanquake:
ACK 7f2dc610a5ac68c915192bf5df5ad9e7177bf18e - backports look correct.
Tree-SHA512: 46b45df8137efd42491dd3ac110c00e6e1bf4ab18a6bbbf68307fe976f391055b1987a22c101060ef5ae8ff1a2b738e197ad579754d1068d78f5eddcd45c7f69
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lint/06_script.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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 |