ci: Minor improvements inspired by Bitcoin Core #1199

pull real-or-random wants to merge 2 commits into bitcoin-core:master from real-or-random:202301-ci-clone-depth changing 1 files +5 −3

real-or-random commented at 9:48 PM on January 27, 2023: contributor

This steals two recent CI improvements from bitcoin/bitcoin. See individual commit messages.

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.

(copied from bitcoin/bitcoin@fad7281d7842f337932cf44e703fdd631230ddd6)

0ecf318851

ci: Don't fetch git history

(copied from bitcoin/bitcoin@faa65f12fc137231c0333330f670847473650028)

c2415866c7

sipa commented at 4:44 AM on January 30, 2023: contributor

utACK c2415866c7a6769cb29e3db6c5312c1255b37083
real-or-random merged this on Jan 30, 2023
real-or-random closed this on Jan 30, 2023

in .cirrus.yml:59 in c2415866c7

  54 | @@ -53,11 +55,11 @@ cat_logs_snippet: &CAT_LOGS
  55 |  
  56 |  merge_base_script_snippet: &MERGE_BASE
  57 |    merge_base_script:
  58 | -    - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
  59 | -    - git fetch $CIRRUS_REPO_CLONE_URL $CIRRUS_BASE_BRANCH
  60 |      - git config --global user.email "ci@ci.ci"
  61 |      - git config --global user.name "ci"

hebasto commented at 4:17 PM on January 30, 2023:

Those lines could be removed as well.

real-or-random commented at 4:20 PM on January 30, 2023:

Oh, I see. Do you want to open a PR?

hebasto commented at 4:21 PM on January 30, 2023:

Oh, I see. Do you want to open a PR?

I'll handle it :)

hebasto commented at 4:31 PM on January 30, 2023:

Do you want to open a PR?

#1201.

hebasto cross-referenced this on Jan 30, 2023 from issue ci: Do not set git's `user.{email,name}` config options by hebasto
real-or-random referenced this in commit 8ebe5c5205 on Jan 31, 2023
hebasto referenced this in commit 7c0cc5d976 on Mar 7, 2023
dhruv referenced this in commit a5df79db12 on Mar 7, 2023
dhruv referenced this in commit 77b510d84c on Mar 7, 2023
sipa referenced this in commit 763079a3f1 on Mar 8, 2023
div72 referenced this in commit 945b094575 on Mar 14, 2023
vmta referenced this in commit e1120c94a1 on Jun 4, 2023
vmta referenced this in commit 8f03457eed on Jul 1, 2023
jonasnick cross-referenced this on Jul 20, 2023 from issue Upstream PRs 1160, 1193, 1169, 1190, 1192, 1194, 1196, 1195, 1170, 1172, 1200, 1199, 1203, 1201, 1206, 1078, 1209, 979, 1212, 1218, 1217, 1221, 1222 by jonasnick

Contributors

real-or-random

sipa

hebasto

Linked (view graph)

#1201 ci: Do not set git's `user.{email,name}` config options