ci: Use same `merge_script` implementation for Windows as for all #26236

pull hebasto wants to merge 2 commits into bitcoin:master from hebasto:221003-merge changing 2 files +4 −12

hebasto commented at 6:01 PM on October 3, 2022: member

This PR is a continuation of bitcoin/bitcoin#26202 and it suggests the same approach for the "Win64 native" CI task.
hebasto added the label Tests on Oct 3, 2022
hebasto marked this as ready for review on Oct 3, 2022

in ci/lint/06_script.sh:34 in 3d9a2e9af0 outdated

  30 | @@ -31,6 +31,10 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t
  31 |      git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
  32 |      git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root
  33 |      mapfile -t KEYS < contrib/verify-commits/trusted-keys
  34 | +    if [ "$CI" = "true" ]; then

MarcoFalke commented at 7:19 AM on October 4, 2022:

maybe remove this check, since there is already the [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] check?

hebasto commented at 7:55 AM on October 4, 2022:

Thanks! Updated.

in ci/lint/06_script.sh:36 in 3d9a2e9af0 outdated

  30 | @@ -31,6 +31,10 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t
  31 |      git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
  32 |      git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root
  33 |      mapfile -t KEYS < contrib/verify-commits/trusted-keys
  34 | +    if [ "$CI" = "true" ]; then
  35 | +      git config --global user.email "ci@ci.ci"
  36 | +      git config --global user.name "ci"

MarcoFalke commented at 7:19 AM on October 4, 2022:

maybe remove --global?

hebasto commented at 7:55 AM on October 4, 2022:

Thanks! Updated.

ci: Move `git config` commands into script where they are used ac1d99240a
ci: Use same `merge_script` implementation for Windows as for all 37cf472063
hebasto force-pushed on Oct 4, 2022
hebasto commented at 7:54 AM on October 4, 2022: member
Updated 3d9a2e9af000ca7fcac3244677d5f50a3d6da562 -> 37cf4720635b63cbe36a900a2411718704b63899 (pr26236.01 -> pr26236.02, diff):
- addressed @MarcoFalke's comments
MarcoFalke approved
MarcoFalke commented at 8:06 AM on October 4, 2022: member

lgtm
fanquake merged this on Oct 4, 2022
fanquake closed this on Oct 4, 2022
hebasto deleted the branch on Oct 4, 2022
sidhujag referenced this in commit e52134e074 on Oct 4, 2022

in .cirrus.yml:126 in 37cf472063

 118 | -    - git config --global user.name "ci"
 119 | -    # Windows filesystem loses the executable bit, and all of the executable
 120 | -    # files are considered "modified" now. It will break the following `git merge`
 121 | -    # command. The next two commands make git ignore this issue.
 122 | -    - git config core.filemode false
 123 | -    - git reset --hard

MarcoFalke commented at 2:16 PM on October 4, 2022:

From the red CI, looks like this is still required

hebasto commented at 2:39 PM on October 4, 2022:

Amended in #26249.

hebasto referenced this in commit 14784aa02c on Nov 1, 2022
hebasto referenced this in commit 7f2dc610a5 on Nov 1, 2022
MarcoFalke referenced this in commit ca5f8f0de2 on Nov 1, 2022
bitcoin locked this on Oct 4, 2023

Contributors

hebasto

MarcoFalke

Labels

Tests

Linked (view graph)

#26435 [24.x] CI backports #26436 [24.x] CI backports