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

hebasto commented at 2:11 PM on October 4, 2022: member

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

From https://github.com/bitcoin/bitcoin
 * branch                refs/pull/26103/merge -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by checkout:
	ci/lint/04_install.sh
	ci/lint/06_script.sh
	contrib/devtools/gen-manpages.py
	contrib/devtools/symbol-check.py
	contrib/signet/getcoins.py
	contrib/signet/miner
	test/functional/feature_proxy.py
	test/functional/feature_taproot.py
	test/functional/interface_rest.py
	test/functional/mining_prioritisetransaction.py
	test/functional/rpc_blockchain.py
	test/functional/rpc_fundrawtransaction.py
	test/functional/rpc_help.py
	test/functional/rpc_rawtransaction.py
	test/functional/test_framework/test_framework.py
	test/functional/test_runner.py
	test/functional/wallet_basic.py
	test/functional/wallet_bumpfee.py
	test/functional/wallet_hd.py
	test/functional/wallet_importmulti.py
	test/functional/wallet_listdescriptors.py
	test/functional/wallet_multiwallet.py
	test/functional/wallet_resendwallettransactions.py
	test/functional/wallet_sendall.py
	test/lint/lint-locale-dependence.py
Please commit your changes or stash them before you switch branches.
Aborting

fanquake added the label Tests on Oct 4, 2022
fanquake added the label Windows on Oct 4, 2022
ci: Workaround Windows filesystem executable bit loss b8d361ab6f

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.

hebasto force-pushed on Oct 4, 2022
hebasto marked this as ready for review on Oct 4, 2022

hebasto commented at 2:38 PM on October 4, 2022: member

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

From https://github.com/bitcoin/bitcoin
 * branch                refs/pull/26249/merge -> FETCH_HEAD
HEAD is now at 240c68397 Merge b8d361ab6fa2c672a08114e20a29a12537148e2d into 4fa50dd055ca030eb69861cee8aee643ac5f7098

MarcoFalke merged this on Oct 4, 2022
MarcoFalke closed this on Oct 4, 2022
hebasto deleted the branch on Oct 4, 2022
bitcoin locked this on Oct 4, 2023

Contributors

hebasto

MarcoFalke

Labels

Windows Tests