diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-09-29 13:43:06 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-11-01 12:52:04 +0000 |
| commit | b1268254bacabbd5e5c783dd06879ea96c327ad8 (patch) | |
| tree | cbc55a2662039bdb044ba8b8c88a3f63a661a273 | |
| parent | c540f07ec3846b43f3af8a74820fd055ada5dfe5 (diff) | |
| download | bitcoin-b1268254bacabbd5e5c783dd06879ea96c327ad8.tar.xz | |
ci: Use remote pull/merge ref instead of local git merge
The merge strategy on the remote may be different than the local one.
This may cause local merges to be different or fail completely. Fix this
by using the result of the remote merge.
Github-Pull: bitcoin/bitcoin#26202
Rebased-From: fad7281d7842f337932cf44e703fdd631230ddd6
| -rw-r--r-- | .cirrus.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ae962f2906..de7b45c920 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,8 +30,8 @@ base_template: &BASE_TEMPLATE - 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 + - git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge" + - git checkout FETCH_HEAD # Use merged changes to detect silent merge conflicts main_template: &MAIN_TEMPLATE timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out |