diff options
| author | fanquake <fanquake@gmail.com> | 2022-05-29 22:00:35 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-05-29 22:00:54 +0100 |
| commit | fb7437f66f9d1c660c1040a9d12b04ca57c6e66c (patch) | |
| tree | 054ca31e88ea9955c8f4a8eb3cae4ed945baec41 | |
| parent | ba48fcf4a40c5b9888459511fb4233a1b89184cc (diff) | |
| parent | 3ffc190321836f7c79f0cb21ee71d357a0e32c44 (diff) | |
| download | bitcoin-fb7437f66f9d1c660c1040a9d12b04ca57c6e66c.tar.xz | |
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
| -rwxr-xr-x | ci/test/00_setup_env_win64.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 3f43bf227b..3600113551 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_win64 export DOCKER_NAME_TAG=ubuntu:22.04 # Check that Jammy can cross-compile to 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 GOAL="deploy" export BITCOIN_CONFIG="--enable-reduce-exports --disable-external-signer --disable-gui-tests" |