Skip to content

Commit 2d8d9ae

Browse files
author
MacroFake
committed
Merge bitcoin#26249: ci: Workaround Windows filesystem executable bit loss
b8d361a ci: Workaround Windows filesystem executable bit loss (Hennadii Stepanov) Pull request description: 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 ``` Top commit has no ACKs. Tree-SHA512: 2b33d882a515bb17c7c2ae8cfe73541483cdc15e736909afaf42befc8f648dba5dc83ff58ebd6d38a5650a8eca01907ae6c61537927ac9718bd9582d8501647d
2 parents 4fa50dd + b8d361a commit 2d8d9ae

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ task:
114114
QT_CONFIGURE_COMMAND: '..\configure -release -silent -opensource -confirm-license -opengl desktop -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -nomake examples -nomake tests -nomake tools -no-angle -no-dbus -no-gif -no-gtk -no-ico -no-icu -no-libjpeg -no-libudev -no-sql-sqlite -no-sql-odbc -no-sqlite -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip doc -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtlottie -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquick3d -skip qtquickcontrols -skip qtquickcontrols2 -skip qtquicktimeline -skip qtremoteobjects -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtsvg -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebglplugin -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-bearermanagement -no-feature-printdialog -no-feature-printer -no-feature-printpreviewdialog -no-feature-printpreviewwidget -no-feature-sql -no-feature-sqlmodel -no-feature-textbrowser -no-feature-textmarkdownwriter -no-feature-textodfwriter -no-feature-xml'
115115
IgnoreWarnIntDirInTempDetected: 'true'
116116
merge_script:
117-
- PowerShell -NoLogo -Command if ($env:CIRRUS_PR -ne $null) { git fetch $env:CIRRUS_REPO_CLONE_URL pull/$env:CIRRUS_PR/merge; git checkout FETCH_HEAD; }
117+
- PowerShell -NoLogo -Command if ($env:CIRRUS_PR -ne $null) { git fetch $env:CIRRUS_REPO_CLONE_URL pull/$env:CIRRUS_PR/merge; git reset --hard FETCH_HEAD; }
118118
msvc_qt_built_cache:
119119
folder: "%QTBASEDIR%"
120120
reupload_on_changes: false

0 commit comments

Comments
 (0)