diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-11-13 11:26:30 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-15 09:22:06 +0000 |
| commit | 2f60fc6d8c6b1d8e74c340fed495b76deac4a048 (patch) | |
| tree | a85171d09cb177a4c543d70581d527babac77a46 | |
| parent | 801b0f05aaf974ab9b0e3f7b59948564638d593f (diff) | |
| download | bitcoin-2f60fc6d8c6b1d8e74c340fed495b76deac4a048.tar.xz | |
ci: Replace soon EOL hirsute with jammy
Github-Pull: #23504
Rebased-From: fafa66e424cd0c4a4ac3175e0d3b15a54626aa4b
| -rw-r--r-- | .cirrus.yml | 8 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_asan.sh | 2 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_tsan.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 04365430b9..aa3ea614b2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -122,10 +122,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" task: - name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]' + name: '[depends, sanitizers: thread (TSan), no gui] [jammy]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:hirsute + image: ubuntu:jammy cpu: 6 # Increase CPU and Memory to avoid timeout memory: 24G env: @@ -143,10 +143,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" task: - name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]' + name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [jammy]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:hirsute + image: ubuntu:jammy env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" diff --git a/ci/test/00_setup_env_native_asan.sh b/ci/test/00_setup_env_native_asan.sh index ab185b6e71..947c4b2891 100755 --- a/ci/test/00_setup_env_native_asan.sh +++ b/ci/test/00_setup_env_native_asan.sh @@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_asan export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev" -export DOCKER_NAME_TAG=ubuntu:hirsute +export DOCKER_NAME_TAG=ubuntu:22.04 export NO_DEPENDS=1 export GOAL="install" export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=address,integer,undefined CC=clang CXX=clang++" diff --git a/ci/test/00_setup_env_native_tsan.sh b/ci/test/00_setup_env_native_tsan.sh index a5082bdaab..5d0880ff4a 100755 --- a/ci/test/00_setup_env_native_tsan.sh +++ b/ci/test/00_setup_env_native_tsan.sh @@ -7,7 +7,7 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_tsan -export DOCKER_NAME_TAG=ubuntu:hirsute +export DOCKER_NAME_TAG=ubuntu:22.04 export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq" export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'" export GOAL="install" |