Skip to content

Commit fa880b1

Browse files
author
MarcoFalke
committed
ci: Unconditionally set the global git author name in cirrys.yml
The author is also needed for the verify-commits.py script.
1 parent 0492b56 commit fa880b1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.cirrus.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE
2121
base_template: &BASE_TEMPLATE
2222
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
2323
merge_base_script:
24+
# Unconditionally install git (used in fingerprint_script) and set the
25+
# default git author name (used in verify-commits.py)
2426
- bash -c "$PACKAGE_MANAGER_INSTALL git"
25-
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
26-
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
2727
- git config --global user.email "[email protected]"
2828
- git config --global user.name "ci"
29+
- if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
30+
- git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
2931
- git merge FETCH_HEAD # Merge base to detect silent merge conflicts
3032
stateful: false # https://cirrus-ci.org/guide/writing-tasks/#stateful-tasks
3133

0 commit comments

Comments
 (0)