diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-08-19 12:16:37 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-08-26 11:17:07 +0200 |
| commit | fa880b10d67542b8eb476a0e1f3ffb67e88d5e53 (patch) | |
| tree | 16cb165deb0bb9612a880f94ab0a838bc2c89f24 /.cirrus.yml | |
| parent | 0492b56e38c24e599a221b5bb276957c674cfafe (diff) | |
| download | bitcoin-fa880b10d67542b8eb476a0e1f3ffb67e88d5e53.tar.xz | |
ci: Unconditionally set the global git author name in cirrys.yml
The author is also needed for the verify-commits.py script.
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index fe75403261..4a7c4eaf55 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,11 +21,13 @@ persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE base_template: &BASE_TEMPLATE skip: $CIRRUS_REPO_FULL_NAME == "bitcoin-core/gui" && $CIRRUS_PR == "" # No need to run on the read-only mirror, unless it is a PR. https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution merge_base_script: + # Unconditionally install git (used in fingerprint_script) and set the + # default git author name (used in verify-commits.py) - bash -c "$PACKAGE_MANAGER_INSTALL git" - - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi - - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH - 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 $CIRRUS_BASE_BRANCH - git merge FETCH_HEAD # Merge base to detect silent merge conflicts stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks |