Skip to content

Commit 3de5fcc

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24296: ci: use Ubuntu Jammy for Windows cross-compilation CI
a1515cd 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 a1515cd hebasto: ACK a1515cd, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: a57cce1874324c9dd00e5d8989996d214facbdd561440471c15e6cc1808bca1c6fd758abe7a1b87378b2e7f9c25e7c9d8242df911cd1ef6cfbe49718adc3be5d
2 parents 7cc39b1 + a1515cd commit 3de5fcc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ task:
176176
QEMU_USER_CMD: "" # Disable qemu and run the test natively
177177

178178
task:
179-
name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]'
179+
name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]'
180180
<< : *GLOBAL_TASK_TEMPLATE
181181
container:
182-
image: ubuntu:focal
182+
image: ubuntu:jammy
183183
env:
184184
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
185185
FILE_ENV: "./ci/test/00_setup_env_win64.sh"

ci/test/00_setup_env_win64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64
10+
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"
1313
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file"

0 commit comments

Comments
 (0)