diff options
| author | fanquake <fanquake@gmail.com> | 2022-02-09 11:53:36 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-18 15:19:05 +0000 |
| commit | a1515cdd9683942d733ff509b785cb3ca73c7a30 (patch) | |
| tree | 91daada964f6d73c2777e844ab3a38be95ff5b6d | |
| parent | 66636ca438cb65fb18bcaa4540856cef0cee2029 (diff) | |
| download | bitcoin-a1515cdd9683942d733ff509b785cb3ca73c7a30.tar.xz | |
ci: use Ubuntu Jammy for Windows CI
This means we'll compile using GCC 10.3.x and mingw-w64 8.0.0 which
better matches our Guix release environment.
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_win64.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5624c97d56..31bdb66e98 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -176,10 +176,10 @@ task: QEMU_USER_CMD: "" # Disable qemu and run the test natively task: - name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]' + name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [jammy]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:focal + image: ubuntu:jammy env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_win64.sh" 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" |