ci: Drop manual checkout of merge commit #1368

pull real-or-random wants to merge 1 commits into bitcoin-core:master from real-or-random:202307-ci-drop-merge changing 2 files +2 −21

real-or-random commented at 9:06 AM on July 1, 2023: contributor

This is no longer necessary as of https://github.com/cirruslabs/cirrus-ci-docs/issues/791#issuecomment-1615691585 .
real-or-random commented at 9:06 AM on July 1, 2023: contributor

cc @MarcoFalke
real-or-random commented at 11:01 AM on July 1, 2023: contributor

The merge commit is correctly checked out, see https://cirrus-ci.com/task/5333035701239808?logs=test#L2 in the CI logs.

ci: Drop manual checkout of merge commit

This is no longer necessary as of
https://github.com/cirruslabs/cirrus-ci-docs/issues/791#issuecomment-1615691585 .

98579e297b

real-or-random force-pushed on Jul 1, 2023
real-or-random renamed this:
~~ci: Drop manual checkout of merge script~~
ci: Drop manual checkout of merge commit
on Jul 1, 2023
maflcko approved
maflcko commented at 2:26 PM on July 1, 2023: contributor

lgtm
jonasnick commented at 10:26 AM on July 2, 2023: contributor

Where does one set the "config resolution strategy"?
maflcko commented at 10:40 AM on July 2, 2023: contributor

https://cirrus-ci.com/github/bitcoin-core/secp256k1 and then "Settings" :gear:
jonasnick approved
jonasnick commented at 6:20 PM on July 2, 2023: contributor

Thanks @MarcoFalke.

ACK 98579e297b19bbb23c924f21942eccdbd618de67
jonasnick merged this on Jul 2, 2023
jonasnick closed this on Jul 2, 2023

in ci/cirrus.sh:8 in 98579e297b

   3 | @@ -4,7 +4,8 @@ set -eux
   4 |  
   5 |  export LC_ALL=C
   6 |  
   7 | -# Print relevant CI environment to allow reproducing the job outside of CI.
   8 | +# Print commit and relevant CI environment to allow reproducing the job outside of CI.
   9 | +git show --no-patch

hebasto commented at 8:12 AM on July 3, 2023:

It would be nice to have a similar command in the native Windows task as well.

hebasto commented at 8:12 AM on July 3, 2023: member

Post-merge ACK 98579e297b19bbb23c924f21942eccdbd618de67.
real-or-random referenced this in commit 7966aee31d on Jul 3, 2023
fanquake referenced this in commit 56c05c5ec4 on Jul 17, 2023
fanquake referenced this in commit ff061fde18 on Jul 18, 2023
hebasto referenced this in commit 270d2b37b8 on Jul 21, 2023
delta1 referenced this in commit 3f32c20932 on Aug 8, 2023
delta1 referenced this in commit 31ac0c1081 on Aug 31, 2023
janus referenced this in commit 476a2176e7 on Sep 11, 2023
div72 referenced this in commit af627d47c3 on Apr 12, 2025
str4d referenced this in commit 3b49801869 on Jun 4, 2025

Contributors

Linked (view graph)

#1369 ci: Print commit in Windows container