Skip to content

Commit faeb1ba

Browse files
author
MarcoFalke
committed
ci: refactor: Use version id over version codename consistently
Also, remove the minor version from the comment, because it does not matter and may even change at any time.
1 parent fae322a commit faeb1ba

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/test/00_setup_env_arm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export HOST=arm-linux-gnueabihf
1010
export DPKG_ADD_ARCH="armhf"
1111
export PACKAGES="python3-zmq g++-arm-linux-gnueabihf busybox libc6:armhf libstdc++6:armhf libfontconfig1:armhf libxcb1:armhf"
1212
export CONTAINER_NAME=ci_arm_linux
13-
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:noble" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.3, similar to guix) can cross-compile
13+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-arm-linux-gnueabihf (version 13.x, similar to guix) can cross-compile
1414
export CI_IMAGE_PLATFORM="linux/arm64"
1515
export USE_BUSY_BOX=true
1616
export RUN_UNIT_TESTS=true

ci/test/00_setup_env_win64.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_win64
10-
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:noble" # Check that g++-mingw-w64-x86-64-posix (version 13.2, similar to guix) can cross-compile
10+
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:24.04" # Check that https://packages.ubuntu.com/noble/g++-mingw-w64-x86-64-posix (version 13.x, similar to guix) can cross-compile
1111
export CI_IMAGE_PLATFORM="linux/amd64"
1212
export HOST=x86_64-w64-mingw32
1313
export PACKAGES="g++-mingw-w64-x86-64-posix nsis"

0 commit comments

Comments
 (0)