aboutsummaryrefslogtreecommitdiff
path: root/.cirrus.yml
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2022-10-03 18:51:56 +0100
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2022-11-01 12:52:04 +0000
commit14784aa02c61ef71f028ef1e61e567d7131f79b9 (patch)
tree88695deb53c5a735bd085961fa7523414f0b64d3 /.cirrus.yml
parentb1268254bacabbd5e5c783dd06879ea96c327ad8 (diff)
downloadbitcoin-14784aa02c61ef71f028ef1e61e567d7131f79b9.tar.xz
ci: Move `git config` commands into script where they are used
Github-Pull: bitcoin/bitcoin#26236 Rebased-From: ac1d99240af6c5d3ed5db2beea1479903d949a37
Diffstat (limited to '.cirrus.yml')
-rw-r--r--.cirrus.yml5
1 files changed, 1 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index de7b45c920..208a98ff35 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -24,11 +24,8 @@ filter_template: &FILTER_TEMPLATE
base_template: &BASE_TEMPLATE
<< : *FILTER_TEMPLATE
merge_base_script:
- # Unconditionally install git (used in fingerprint_script) and set the
- # default git author name (used in verify-commits.py)
+ # Unconditionally install git (used in fingerprint_script).
- 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
- git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
- git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts