Skip to content

Commit eb243ff

Browse files
committed
Merge bitcoin#31593: ci: Bump centos stream 10
faaabfa ci: Bump centos stream 10 (MarcoFalke) Pull request description: This is a follow-up to fa47baa, which bumped the gcc version to avoid a warning bloat in the CI log. However, it is also required to bump python3, see bitcoin#31476 (comment) > This will uncover an issue in the centos task that the correct python version is missing. I guess this should be fixed by installing and activating an acceptable python version. Instead of bumping the packages individually in centos stream 9, just bump to stream 10. ACKs for top commit: fanquake: ACK faaabfa Tree-SHA512: a564ff3a2a0dc4d39874e87540e67072f293bbed82c8eca22266fcadc16c5571e0e41d38576a63e466b64d13f7e3acbd95be10cf2420de33127aa420eca3b928
2 parents 6dc6012 + faaabfa commit eb243ff

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.cirrus.yml

+1-1
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

+2-3
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

+1-3
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)