diff --git a/.cirrus.yml b/.cirrus.yml index 1fc79f0542..40cef5678a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -146,14 +146,12 @@ task: FILE_ENV: "./ci/test/00_setup_env_win64.sh" task: - name: '32-bit Rocky9, dash, gui' + name: 'CentOS, dash, gui' << : *GLOBAL_TASK_TEMPLATE container: image: quay.io/rockylinux/rockylinux:9 env: - << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - PACKAGE_MANAGER_INSTALL: "dnf update -y && dnf install -y" - FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" + FILE_ENV: "./ci/test/00_setup_env_native_centos.sh" task: name: 'previous releases, depends DEBUG' diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_native_centos.sh similarity index 52% rename from ci/test/00_setup_env_i686_centos.sh rename to ci/test/00_setup_env_native_centos.sh index 1bff5f779f..878778506f 100755 --- a/ci/test/00_setup_env_i686_centos.sh +++ b/ci/test/00_setup_env_native_centos.sh @@ -6,12 +6,10 @@ export LC_ALL=C.UTF-8 -export HOST=i686-pc-linux-gnu -export CONTAINER_NAME=ci_i686_centos -export CI_IMAGE_NAME_TAG=quay.io/rockylinux/rockylinux:9 +export CONTAINER_NAME=ci_native_centos +export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream9" export STREAM_GCC_V="12" -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" +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" export PIP_PACKAGES="pyzmq" export GOAL="install" export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON" -export CONFIG_SHELL="/bin/dash"