Skip to content

Commit fa73674

Browse files
author
MarcoFalke
committed
ci: Run i686 centos ci config on cirrus
1 parent fa1f949 commit fa73674

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

.cirrus.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ task:
7070
env:
7171
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
7272

73+
task:
74+
name: '32-bit + dash [GOAL: install] [CentOS 8] [gui]'
75+
<< : *GLOBAL_TASK_TEMPLATE
76+
container:
77+
image: centos:8
78+
env:
79+
PACKAGE_MANAGER_INSTALL: "yum install -y"
80+
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
81+
7382
task:
7483
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
7584
<< : *GLOBAL_TASK_TEMPLATE

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,3 @@ jobs:
6464
- set -o errexit; source ./ci/lint/05_before_script.sh
6565
script:
6666
- set -o errexit; source ./ci/lint/06_script.sh
67-
68-
- stage: test
69-
name: '32-bit + dash [GOAL: install] [CentOS 8] [gui]'
70-
env: >-
71-
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"

ci/test/00_setup_env_i686_centos.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ export GOAL="install"
1414
export DEP_OPTS="NO_QT=1" # Gui disabled for now to avoid build failures
1515
export BITCOIN_CONFIG="--enable-zmq --with-gui=no --enable-reduce-exports --with-boost-process"
1616
export CONFIG_SHELL="/bin/dash"
17+
export TEST_RUNNER_ENV="LC_ALL=en_US.UTF-8"

ci/test/04_install.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66

77
export LC_ALL=C.UTF-8
88

9-
if [[ $DOCKER_NAME_TAG == centos* ]]; then
10-
export LC_ALL=en_US.utf8
11-
fi
129
if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1310
export LC_ALL=C
1411
fi

ci/test/05_before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [ -z "$NO_DEPENDS" ]; then
4040
# CentOS has problems building the depends if the config shell is not explicitly set
4141
# (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
4242
# an error as the first command is executed)
43-
SHELL_OPTS="CONFIG_SHELL=/bin/bash"
43+
SHELL_OPTS="LC_ALL=en_US.UTF-8 CONFIG_SHELL=/bin/bash"
4444
else
4545
SHELL_OPTS="CONFIG_SHELL="
4646
fi

0 commit comments

Comments
 (0)