ci: Workaround Windows filesystem executable bit loss #26249

pull hebasto wants to merge 1 commits into bitcoin:master from hebasto:221004-wingit changing 1 files +1 −1
  1. hebasto commented at 2:11 pm on October 4, 2022: member

    Fixes https://cirrus-ci.com/task/5946581265416192:

     0From https://github.com/bitcoin/bitcoin
     1 * branch                refs/pull/26103/merge -> FETCH_HEAD
     2error: Your local changes to the following files would be overwritten by checkout:
     3	ci/lint/04_install.sh
     4	ci/lint/06_script.sh
     5	contrib/devtools/gen-manpages.py
     6	contrib/devtools/symbol-check.py
     7	contrib/signet/getcoins.py
     8	contrib/signet/miner
     9	test/functional/feature_proxy.py
    10	test/functional/feature_taproot.py
    11	test/functional/interface_rest.py
    12	test/functional/mining_prioritisetransaction.py
    13	test/functional/rpc_blockchain.py
    14	test/functional/rpc_fundrawtransaction.py
    15	test/functional/rpc_help.py
    16	test/functional/rpc_rawtransaction.py
    17	test/functional/test_framework/test_framework.py
    18	test/functional/test_runner.py
    19	test/functional/wallet_basic.py
    20	test/functional/wallet_bumpfee.py
    21	test/functional/wallet_hd.py
    22	test/functional/wallet_importmulti.py
    23	test/functional/wallet_listdescriptors.py
    24	test/functional/wallet_multiwallet.py
    25	test/functional/wallet_resendwallettransactions.py
    26	test/functional/wallet_sendall.py
    27	test/lint/lint-locale-dependence.py
    28Please commit your changes or stash them before you switch branches.
    29Aborting
    
  2. fanquake added the label Tests on Oct 4, 2022
  3. fanquake added the label Windows on Oct 4, 2022
  4. ci: Workaround Windows filesystem executable bit loss b8d361ab6f
  5. in .cirrus.yml:31 in da27fd0c3b outdated
    27@@ -28,7 +28,7 @@ base_template: &BASE_TEMPLATE
    28     - bash -c "$PACKAGE_MANAGER_INSTALL git"
    29     - if [ "$CIRRUS_PR" = "" ]; then exit 0; fi
    30     - git fetch $CIRRUS_REPO_CLONE_URL "pull/${CIRRUS_PR}/merge"
    31-    - git checkout FETCH_HEAD  # Use merged changes to detect silent merge conflicts
    32+    - git reset --hard FETCH_HEAD  # Use merged changes to detect silent merge conflicts
    


    MarcoFalke commented at 2:17 pm on October 4, 2022:
    wrong task?

    MarcoFalke commented at 2:18 pm on October 4, 2022:
    (Windows is broken, not unix)

    hebasto commented at 2:21 pm on October 4, 2022:
    Indeed.
  6. hebasto force-pushed on Oct 4, 2022
  7. hebasto marked this as ready for review on Oct 4, 2022
  8. hebasto commented at 2:38 pm on October 4, 2022: member

    https://cirrus-ci.com/task/5583266525741056:

    0From https://github.com/bitcoin/bitcoin
    1 * branch                refs/pull/26249/merge -> FETCH_HEAD
    2HEAD is now at 240c68397 Merge b8d361ab6fa2c672a08114e20a29a12537148e2d into 4fa50dd055ca030eb69861cee8aee643ac5f7098
    
  9. MarcoFalke merged this on Oct 4, 2022
  10. MarcoFalke closed this on Oct 4, 2022

  11. hebasto deleted the branch on Oct 4, 2022
  12. bitcoin locked this on Oct 4, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-21 15:12 UTC

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