Skip to content

Commit faaabfa

Browse files
author
MarcoFalke
committed
ci: Bump centos stream 10
1 parent 5b3a81f commit faaabfa

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ task:
140140
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
141141

142142
task:
143-
name: 'CentOS, dash, gui'
143+
name: 'CentOS, depends, gui'
144144
<< : *GLOBAL_TASK_TEMPLATE
145145
persistent_worker:
146146
labels:

ci/test/00_setup_env_native_centos.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_centos
10-
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9"
11-
export STREAM_GCC_V="12"
12-
export CI_BASE_PACKAGES="gcc-toolset-${STREAM_GCC_V}-gcc-c++ glibc-devel gcc-toolset-${STREAM_GCC_V}-libstdc++-devel ccache make git python3 python3-pip which patch xz procps-ng dash rsync coreutils bison e2fsprogs cmake"
10+
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream10"
11+
export CI_BASE_PACKAGES="gcc-c++ glibc-devel libstdc++-devel ccache make git python3 python3-pip which patch xz procps-ng ksh rsync coreutils bison e2fsprogs cmake"
1312
export PIP_PACKAGES="pyzmq"
1413
export GOAL="install"
1514
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON"

ci/test/03_test_script.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ fi
9292

9393
if [ -z "$NO_DEPENDS" ]; then
9494
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
95-
SHELL_OPTS="CONFIG_SHELL=/bin/dash"
96-
# shellcheck disable=SC1090
97-
source "/opt/rh/gcc-toolset-${STREAM_GCC_V}/enable"
95+
SHELL_OPTS="CONFIG_SHELL=/bin/ksh" # Temporarily use ksh instead of dash, until https://bugzilla.redhat.com/show_bug.cgi?id=2335416 is fixed.
9896
else
9997
SHELL_OPTS="CONFIG_SHELL="
10098
fi

0 commit comments

Comments
 (0)