From b75089667c29f4090cb3b35064a7784c5a95bd78 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sun, 29 May 2022 22:00:35 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#25231: ci: Install documented packages for "Win64" CI task 3ffc190321836f7c79f0cb21ee71d357a0e32c44 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 3ffc190321836f7c79f0cb21ee71d357a0e32c44 jarolrod: ACK 3ffc190321836f7c79f0cb21ee71d357a0e32c44 Tree-SHA512: 41fd6deedb3febc90cc4f2037dfbf840d82ef5b1dd950a0ff458cae6c1b1024559b21c8e1135c2d37780e80dd3f9f9751d638120443d0d60c22ac160cf693e2a --- ci/test/00_setup_env_win64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 43f072d2a1..487f90e43c 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_win64 export HOST=x86_64-w64-mingw32 export DPKG_ADD_ARCH="i386" -export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file" +export PACKAGES="python3 nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file" export RUN_FUNCTIONAL_TESTS=false export RUN_SECURITY_TESTS="false" export GOAL="deploy"