diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-07-25 14:37:16 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-23 17:09:12 +0100 |
| commit | fa73674738b0b5a271ae387e2ebd76d747e02d91 (patch) | |
| tree | abb7e969ce1ca6ebf15ad072e042cf732984fbf0 /ci | |
| parent | fa1f949a4dc2568456f3ba30bbd8ecbc78a423ca (diff) | |
ci: Run i686 centos ci config on cirrus
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/test/00_setup_env_i686_centos.sh | 1 | ||||
| -rwxr-xr-x | ci/test/04_install.sh | 3 | ||||
| -rwxr-xr-x | ci/test/05_before_script.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_i686_centos.sh index 52cdb75a0c..eaa68b2ded 100644 --- a/ci/test/00_setup_env_i686_centos.sh +++ b/ci/test/00_setup_env_i686_centos.sh @@ -14,3 +14,4 @@ export GOAL="install" export DEP_OPTS="NO_QT=1" # Gui disabled for now to avoid build failures export BITCOIN_CONFIG="--enable-zmq --with-gui=no --enable-reduce-exports --with-boost-process" export CONFIG_SHELL="/bin/dash" +export TEST_RUNNER_ENV="LC_ALL=en_US.UTF-8" diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh index cce0c7e49e..f0ed314d19 100755 --- a/ci/test/04_install.sh +++ b/ci/test/04_install.sh @@ -6,9 +6,6 @@ export LC_ALL=C.UTF-8 -if [[ $DOCKER_NAME_TAG == centos* ]]; then - export LC_ALL=en_US.utf8 -fi if [[ $QEMU_USER_CMD == qemu-s390* ]]; then export LC_ALL=C fi diff --git a/ci/test/05_before_script.sh b/ci/test/05_before_script.sh index 42c244c2f5..d7dd5d9dec 100755 --- a/ci/test/05_before_script.sh +++ b/ci/test/05_before_script.sh @@ -40,7 +40,7 @@ if [ -z "$NO_DEPENDS" ]; then # CentOS has problems building the depends if the config shell is not explicitly set # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to # an error as the first command is executed) - SHELL_OPTS="CONFIG_SHELL=/bin/bash" + SHELL_OPTS="LC_ALL=en_US.UTF-8 CONFIG_SHELL=/bin/bash" else SHELL_OPTS="CONFIG_SHELL=" fi |