Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Workaround Windows filesystem executable bit loss #26249

Merged
merged 1 commit into from
Oct 4, 2022

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Oct 4, 2022

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

.cirrus.yml Outdated Show resolved Hide resolved
@hebasto hebasto marked this pull request as ready for review October 4, 2022 14:37
@hebasto
Copy link
Member Author

hebasto commented Oct 4, 2022

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

@maflcko maflcko merged commit 2d8d9ae into bitcoin:master Oct 4, 2022
@hebasto hebasto deleted the 221004-wingit branch October 4, 2022 14:44
@bitcoin bitcoin locked and limited conversation to collaborators Oct 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants