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
  1. real-or-random commented at 9:06 am on July 1, 2023: contributor
  2. real-or-random commented at 9:06 am on July 1, 2023: contributor
  3. 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.
  4. 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
  5. real-or-random force-pushed on Jul 1, 2023
  6. real-or-random renamed this:
    ci: Drop manual checkout of merge script
    ci: Drop manual checkout of merge commit
    on Jul 1, 2023
  7. MarcoFalke approved
  8. MarcoFalke commented at 2:26 pm on July 1, 2023: none
    lgtm
  9. jonasnick commented at 10:26 am on July 2, 2023: contributor
    Where does one set the “config resolution strategy”?
  10. MarcoFalke commented at 10:40 am on July 2, 2023: none
  11. jonasnick approved
  12. jonasnick commented at 6:20 pm on July 2, 2023: contributor

    Thanks @MarcoFalke.

    ACK 98579e297b19bbb23c924f21942eccdbd618de67

  13. jonasnick merged this on Jul 2, 2023
  14. jonasnick closed this on Jul 2, 2023

  15. alokeutpal approved
  16. 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.
  17. hebasto commented at 8:12 am on July 3, 2023: member
    Post-merge ACK 98579e297b19bbb23c924f21942eccdbd618de67.
  18. hebasto cross-referenced this on Jul 3, 2023 from issue build: Improvements to symbol visibility logic on Windows (attempt 3) by hebasto
  19. hebasto cross-referenced this on Jul 3, 2023 from issue ci: Print commit in Windows container by hebasto
  20. real-or-random referenced this in commit 7966aee31d on Jul 3, 2023
  21. fanquake referenced this in commit 56c05c5ec4 on Jul 17, 2023
  22. fanquake referenced this in commit ff061fde18 on Jul 18, 2023
  23. hebasto referenced this in commit 270d2b37b8 on Jul 21, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin-core/secp256k1. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-10-30 01:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me