Skip to content

Commit 5e5ad07

Browse files
MarcoFalkepsgreco
authored andcommitted
ci: Replace soon EOL hirsute with jammy
(cherry picked from commit fafa66e)
1 parent 802acaf commit 5e5ad07

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ task:
123123
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
124124

125125
task:
126-
name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]'
126+
name: '[depends, sanitizers: thread (TSan), no gui] [jammy]'
127127
<< : *GLOBAL_TASK_TEMPLATE
128128
container:
129-
image: ubuntu:hirsute
129+
image: ubuntu:jammy
130130
cpu: 6 # Increase CPU and Memory to avoid timeout
131131
memory: 24G
132132
env:
@@ -144,10 +144,10 @@ task:
144144
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
145145

146146
task:
147-
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]'
147+
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [jammy]'
148148
<< : *GLOBAL_TASK_TEMPLATE
149149
container:
150-
image: ubuntu:hirsute
150+
image: ubuntu:jammy
151151
memory: 16G # ELEMENTS: need more memory
152152
cpu: 4 # ELEMENTS: cirrus wants more CPUs if you want more memory
153153
env:

ci/test/00_setup_env_native_asan.sh

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

99
export CONTAINER_NAME=ci_native_asan
1010
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"
11-
export DOCKER_NAME_TAG=ubuntu:hirsute
11+
export DOCKER_NAME_TAG=ubuntu:22.04
1212
export NO_DEPENDS=1
1313
export GOAL="install"
1414
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++"

ci/test/00_setup_env_native_tsan.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_native_tsan
10-
export DOCKER_NAME_TAG=ubuntu:hirsute
10+
export DOCKER_NAME_TAG=ubuntu:22.04
1111
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
1212
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
1313
export GOAL="install"

0 commit comments

Comments
 (0)