Skip to content

Commit ad09c28

Browse files
committed
Merge bitcoin/bitcoin#23504: ci: Replace soon EOL hirsute with jammy
fafa66e ci: Replace soon EOL hirsute with jammy (MarcoFalke) Pull request description: `hirsute` will be EOL in about 1.5 months, at which point the package servers may be shut down. Avoid this by hopping to the next LTS release 22.04 (Jammy Jellyfish). While the release is currently in development, it seems unlikely that anything will break for us. I am doing the hirsute->jammy hop to avoid a hirsute->impish->jammy hop, but if anything does break, we can fall back to that "double hop". ACKs for top commit: fanquake: ACK fafa66e Zero-1729: crACK fafa66e Tree-SHA512: a3626b72519c7f54f260477d04265321af7aefe25cc2a7d653dba77f79caca10db3a6aa4249a934184dcdc99832f6b4c6e50330d7630e58720ab0aba3624ab8a
2 parents d092309 + fafa66e commit ad09c28

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
@@ -208,10 +208,10 @@ task:
208208
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
209209

210210
task:
211-
name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]'
211+
name: '[depends, sanitizers: thread (TSan), no gui] [jammy]'
212212
<< : *GLOBAL_TASK_TEMPLATE
213213
container:
214-
image: ubuntu:hirsute
214+
image: ubuntu:jammy
215215
cpu: 6 # Increase CPU and Memory to avoid timeout
216216
memory: 24G
217217
env:
@@ -229,10 +229,10 @@ task:
229229
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
230230

231231
task:
232-
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]'
232+
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [jammy]'
233233
<< : *GLOBAL_TASK_TEMPLATE
234234
container:
235-
image: ubuntu:hirsute
235+
image: ubuntu:jammy
236236
env:
237237
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
238238
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"

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)