Skip to content

Commit eeeed9c

Browse files
committed
CI: Use RockyLinux 8 instead of CentOS Stream 8
1 parent 842a5a9 commit eeeed9c

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ task:
194194
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
195195

196196
task:
197-
name: '32-bit + dash [gui] [CentOS 8]'
197+
name: '32-bit + dash [gui] [Rocky 8]'
198198
<< : *GLOBAL_TASK_TEMPLATE
199199
container:
200-
image: quay.io/centos/centos:stream8
200+
image: quay.io/rockylinux/rockylinux:8
201201
env:
202202
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
203203
PACKAGE_MANAGER_INSTALL: "yum install -y"

ci/test/00_setup_env_i686_centos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_centos
11-
export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
11+
export DOCKER_NAME_TAG=quay.io/rockylinux/rockylinux:8
1212
export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 xz procps-ng dash rsync coreutils bison"
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"

ci/test/04_install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
6464
CI_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH"
6565
fi
6666

67-
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
67+
if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
6868
${CI_RETRY_EXE} CI_EXEC dnf -y install epel-release
6969
${CI_RETRY_EXE} CI_EXEC dnf -y --allowerasing install "$DOCKER_PACKAGES" "$PACKAGES"
7070
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then

ci/test/05_before_script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
4444
fi
4545

4646
if [ -z "$NO_DEPENDS" ]; then
47-
if [[ $DOCKER_NAME_TAG == *centos* ]]; then
47+
if [[ $DOCKER_NAME_TAG == *centos* ]] || [[ $DOCKER_NAME_TAG == *rocky* ]]; then
4848
# CentOS has problems building the depends if the config shell is not explicitly set
4949
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
5050
# an error as the first command is executed)

0 commit comments

Comments
 (0)