diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 07:55:33 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-02-21 07:55:36 +0100 |
| commit | 3de5fcc94fcdf3b2b597399809c92065c1997fcf (patch) | |
| tree | a6de9573fa711cd732b8c54bd060f3e297698348 /ci | |
| parent | 7cc39b1838792d92a169c38a3bb676c8c43e165f (diff) | |
| parent | a1515cdd9683942d733ff509b785cb3ca73c7a30 (diff) | |
Merge bitcoin/bitcoin#24296: ci: use Ubuntu Jammy for Windows cross-compilation CI
a1515cdd9683942d733ff509b785cb3ca73c7a30 ci: use Ubuntu Jammy for Windows CI (fanquake)
Pull request description:
This means we'll compile using [GCC 10.3.x](https://packages.ubuntu.com/jammy/g++-mingw-w64) and [mingw-w64 8.0.0](https://packages.ubuntu.com/jammy/mingw-w64) which better matches our Guix release environment.
ACKs for top commit:
MarcoFalke:
cr ACK a1515cdd9683942d733ff509b785cb3ca73c7a30
hebasto:
ACK a1515cdd9683942d733ff509b785cb3ca73c7a30, I have reviewed the code and it looks OK, I agree it can be merged.
Tree-SHA512: a57cce1874324c9dd00e5d8989996d214facbdd561440471c15e6cc1808bca1c6fd758abe7a1b87378b2e7f9c25e7c9d8242df911cd1ef6cfbe49718adc3be5d
Diffstat (limited to 'ci')
| -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 6619852423..25aa682eb0 100755 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_win64 -export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to 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" |