phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 14:37:42 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Bump centos:stream8 to centos:stream9

Browse source 
This is required for the next commit. Also, drop CI_RETRY_EXE before
"dnf install", because it requires getopt, which will only be installed
later on via util-linux
This commit is contained in:
MarcoFalke 2023-05-15 14:36:44 +02:00
parent fa6a755d9f
commit fa69955e74
No known key found for this signature in database
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -217,11 +217,11 @@ task:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
task: task:
name: '32-bit + dash [gui] [CentOS 8]' name: '32-bit + dash [gui] [CentOS 9]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
docker_arguments: docker_arguments:
CI_IMAGE_NAME_TAG: quay.io/centos/centos:stream8 CI_IMAGE_NAME_TAG: quay.io/centos/centos:stream9
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
# For faster CI feedback, immediately schedule one task that runs all tests # For faster CI feedback, immediately schedule one task that runs all tests
<< : *CREDITS_TEMPLATE << : *CREDITS_TEMPLATE

8
ci/test/00_setup_env_i686_centos.sh
View file

@ -8,12 +8,10 @@ export LC_ALL=C.UTF-8
export HOST=i686-pc-linux-gnu export HOST=i686-pc-linux-gnu
export CONTAINER_NAME=ci_i686_centos export CONTAINER_NAME=ci_i686_centos
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream8" export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9"
# Use minimum supported python3.8 and gcc-8, see doc/dependencies.md export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison util-linux"
export CI_BASE_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python38 python38-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison"
export PIP_PACKAGES="pyzmq" export PIP_PACKAGES="pyzmq"
export GOAL="install" export GOAL="install"
export NO_WERROR=1 # GCC 8 export NO_WERROR=1 # Suppress error: #warning _FORTIFY_SOURCE > 2 is treated like 2 on this platform [-Werror=cpp]
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports" export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports"
export CONFIG_SHELL="/bin/dash" export CONFIG_SHELL="/bin/dash"
export TEST_RUNNER_ENV="LC_ALL=en_US.UTF-8"

4
ci/test/01_base_install.sh
View file

@ -18,8 +18,8 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
fi fi
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
${CI_RETRY_EXE} bash -c "dnf -y install epel-release" bash -c "dnf -y install epel-release"
${CI_RETRY_EXE} bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES" bash -c "dnf -y --allowerasing install $CI_BASE_PACKAGES $PACKAGES"
elif [ "$CI_USE_APT_INSTALL" != "no" ]; then elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then if [[ -n "${APPEND_APT_SOURCES_LIST}" ]]; then
echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list echo "${APPEND_APT_SOURCES_LIST}" >> /etc/apt/sources.list

2
ci/test/06_script_b.sh
View file

@ -52,7 +52,7 @@ fi
if [ -z "$NO_DEPENDS" ]; then if [ -z "$NO_DEPENDS" ]; then
if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then if [[ $CI_IMAGE_NAME_TAG == *centos* ]]; then
SHELL_OPTS="LC_ALL=en_US.UTF-8 CONFIG_SHELL=/bin/dash" SHELL_OPTS="CONFIG_SHELL=/bin/dash"
else else
SHELL_OPTS="CONFIG_SHELL=" SHELL_OPTS="CONFIG_SHELL="
fi fi