ci: Use remote pull/merge ref instead of local git merge #26202

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2209-ci-merge-remote-🤛 changing 1 files +2 −2

MarcoFalke commented at 11:23 AM on September 29, 2022: member

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.

Fixes https://github.com/bitcoin/bitcoin/issues/26163

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.

fad7281d78

in .cirrus.yml:34 in fad7281d78

  29 | @@ -30,8 +30,8 @@ base_template: &BASE_TEMPLATE
  30 |      - git config --global user.email "ci@ci.ci"
  31 |      - git config --global user.name "ci"
  32 |      - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
  33 | -    - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
  34 | -    - git merge FETCH_HEAD  # Merge base to detect silent merge conflicts
  35 | +    - git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
  36 | +    - git checkout FETCH_HEAD  # Use merged changes to detect silent merge conflicts

hebasto commented at 11:27 AM on September 29, 2022:

Is comment correct? Can git checkout really "detect silent merge conflicts"?

MarcoFalke commented at 11:37 AM on September 29, 2022:

Yes, the silent conflicts may be detected by the following ci script (make check etc). This change isn't changing that

DrahtBot added the label Tests on Sep 29, 2022
hebasto approved
hebasto commented at 12:32 PM on September 29, 2022: member

ACK fad7281d7842f337932cf44e703fdd631230ddd6, I regularly use the same commands locally.

Interesting, that git fetch origin pull/ID/merge command was mentioned in GitHub's docs in the past. But I failed to find a reference to it now...
fanquake requested review from luke-jr on Sep 29, 2022
luke-jr approved
luke-jr commented at 5:12 PM on September 29, 2022: member

ACK

Checked that CI is getting the right thing checked out.
MarcoFalke merged this on Sep 29, 2022
MarcoFalke closed this on Sep 29, 2022
MarcoFalke deleted the branch on Sep 29, 2022
bitcoin deleted a comment on Sep 29, 2022
sidhujag referenced this in commit a44a60a549 on Sep 30, 2022
fanquake referenced this in commit 4fa50dd055 on Oct 4, 2022
hebasto referenced this in commit b1268254ba on Nov 1, 2022
MarcoFalke referenced this in commit ca5f8f0de2 on Nov 1, 2022
bitcoin locked this on Sep 29, 2023

Contributors

Labels

Linked (view graph)

#26163 CI: Old versions of git can't handle merges #26435 [24.x] CI backports #26436 [24.x] CI backports