Skip to content

Commit 5763b23

Browse files
committed
ci: return to using Ubuntu 22.04 in MSAN jobs
We no-longer need to use 23.04, now that we aren't installing clang-16 and friends.
1 parent d3cbcbf commit 5763b23

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ task:
252252
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
253253

254254
task:
255-
name: '[MSan, depends] [lunar]'
255+
name: '[MSan, depends] [jammy]'
256256
<< : *GLOBAL_TASK_TEMPLATE
257257
container:
258258
docker_arguments:
259-
CI_IMAGE_NAME_TAG: ubuntu:lunar
259+
CI_IMAGE_NAME_TAG: ubuntu:jammy
260260
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
261261
env:
262262
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV

ci/test/00_setup_env_native_fuzz_with_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:23.04" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
9+
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
1010
LIBCXX_DIR="${BASE_SCRATCH_DIR}/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"

ci/test/00_setup_env_native_msan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:23.04" # Version 23.04 will reach EOL in Jan 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
9+
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
1010
LIBCXX_DIR="${BASE_SCRATCH_DIR}/msan/cxx_build/"
1111
export MSAN_FLAGS="-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer -g -O1 -fno-optimize-sibling-calls"
1212
LIBCXX_FLAGS="-nostdinc++ -nostdlib++ -isystem ${LIBCXX_DIR}include/c++/v1 -L${LIBCXX_DIR}lib -Wl,-rpath,${LIBCXX_DIR}lib -lc++ -lc++abi -lpthread -Wno-unused-command-line-argument"

0 commit comments

Comments
 (0)