Skip to content

Commit 832d573

Browse files
committed
Merge bitcoin/bitcoin#31651: ci: Turn CentOS task into native one
fabefd9 ci: Turn CentOS task into native one (MarcoFalke) Pull request description: Cross-compiling to `i686-pc-linux-gnu` on CentOS in the CI is mostly redundant with the `ci/test/00_setup_env_i686_multiprocess.sh` task (albeit it using clang): https://github.com/bitcoin/bitcoin/blob/35bf426e02210c1bbb04926f4ca2e0285fbfcd11/ci/test/00_setup_env_i686_multiprocess.sh#L9-L12 One task seems sufficient as a sanity check, given that there seems to be no real demand for this architecture anyway. Turning the task into a native one makes it possible to run the task natively on aarch64 or any other supported architecture. Also, remove the install of the `lbzip2` package, which is unused since commit a46065e Also, remove the `CONFIG_SHELL` env var, which is unused since the cmake migration. (`CONFIG_SHELL` in depends is still kept). ACKs for top commit: davidgumberg: ACK bitcoin/bitcoin@fabefd9 hebasto: ACK fabefd9, tested locally on Ubuntu 24.10. Tree-SHA512: 5a7b3131b379d11ef602e5821165861e9bdf61d605014bf8fcb33b8e12d8823450798af2d3289b96f7559dfa47b839bf939ddc0b3725efecfeac7ae570a981e7
2 parents 5ac1e08 + fabefd9 commit 832d573

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,13 @@ task:
140140
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
141141

142142
task:
143-
name: '32-bit CentOS, dash, gui'
143+
name: 'CentOS, dash, gui'
144144
<< : *GLOBAL_TASK_TEMPLATE
145145
persistent_worker:
146146
labels:
147147
type: small
148148
env:
149-
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
149+
FILE_ENV: "./ci/test/00_setup_env_native_centos.sh"
150150

151151
task:
152152
name: 'previous releases, depends DEBUG'

ci/test/00_setup_env_i686_centos.sh renamed to ci/test/00_setup_env_native_centos.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=i686-pc-linux-gnu
10-
export CONTAINER_NAME=ci_i686_centos
11-
export CI_IMAGE_NAME_TAG="quay.io/centos/amd64:stream9"
9+
export CONTAINER_NAME=ci_native_centos
10+
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9"
1211
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"
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"
1413
export PIP_PACKAGES="pyzmq"
1514
export GOAL="install"
1615
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON"
17-
export CONFIG_SHELL="/bin/dash"

0 commit comments

Comments
 (0)