Skip to content

Commit fa47baa

Browse files
author
MarcoFalke
committed
ci: Bump centos gcc
1 parent 6769368 commit fa47baa

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

ci/test/00_setup_env_i686_centos.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2020-2022 The Bitcoin Core developers
3+
# Copyright (c) 2020-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -9,9 +9,9 @@ export LC_ALL=C.UTF-8
99
export HOST=i686-pc-linux-gnu
1010
export CONTAINER_NAME=ci_i686_centos
1111
export CI_IMAGE_NAME_TAG="quay.io/centos/amd64:stream9"
12-
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison e2fsprogs cmake"
12+
export STREAM_GCC_V="12"
13+
export CI_BASE_PACKAGES="gcc-toolset-${STREAM_GCC_V}-gcc-c++ glibc-devel.x86_64 gcc-toolset-${STREAM_GCC_V}-libstdc++-devel.x86_64 glibc-devel.i686 gcc-toolset-${STREAM_GCC_V}-libstdc++-devel.i686 ccache make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison e2fsprogs cmake"
1314
export PIP_PACKAGES="pyzmq"
1415
export GOAL="install"
15-
export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
1616
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON"
1717
export CONFIG_SHELL="/bin/dash"

ci/test/03_test_script.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ fi
9393
if [ -z "$NO_DEPENDS" ]; then
9494
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
9595
SHELL_OPTS="CONFIG_SHELL=/bin/dash"
96+
# shellcheck disable=SC1090
97+
source "/opt/rh/gcc-toolset-${STREAM_GCC_V}/enable"
9698
else
9799
SHELL_OPTS="CONFIG_SHELL="
98100
fi

0 commit comments

Comments
 (0)