Skip to content

Commit fb7437f

Browse files
committed
Merge bitcoin/bitcoin#25231: ci: Install documented packages for "Win64" CI task
3ffc190 ci: Install documented packages for "Win64" CI task (Hennadii Stepanov) Pull request description: This minor change has the following benefits: - it follows the [documented](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md#building-for-64-bit-windows) way for modern Ubuntu distros (this CI task uses jammy) - it makes package installation time shorter as no need to install the `g++-mingw-w64-x86-64-win32` package - (not directly related to this repo) in https://github.com/bitcoin-core/gui-qml Qt 5.15.3 (but not 5.15.2) build system goes [wild](https://cirrus-ci.com/task/6231535933194240) otherwise ACKs for top commit: fanquake: ACK 3ffc190 jarolrod: ACK 3ffc190 Tree-SHA512: 41fd6deedb3febc90cc4f2037dfbf840d82ef5b1dd950a0ff458cae6c1b1024559b21c8e1135c2d37780e80dd3f9f9751d638120443d0d60c22ac160cf693e2a
2 parents ba48fcf + 3ffc190 commit fb7437f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ci/test/00_setup_env_win64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_win64
1010
export DOCKER_NAME_TAG=ubuntu:22.04 # Check that Jammy can cross-compile to win64
1111
export HOST=x86_64-w64-mingw32
1212
export DPKG_ADD_ARCH="i386"
13-
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file"
13+
export PACKAGES="python3 nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"
1414
export RUN_FUNCTIONAL_TESTS=false
1515
export GOAL="deploy"
1616
export BITCOIN_CONFIG="--enable-reduce-exports --disable-external-signer --disable-gui-tests"

0 commit comments

Comments
 (0)