From fa73674738b0b5a271ae387e2ebd76d747e02d91 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Sat, 25 Jul 2020 14:37:16 +0200
Subject: ci: Run i686 centos ci config on cirrus

---
 .cirrus.yml                         | 9 +++++++++
 .travis.yml                         | 5 -----
 ci/test/00_setup_env_i686_centos.sh | 1 +
 ci/test/04_install.sh               | 3 ---
 ci/test/05_before_script.sh         | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 35000dc469..e0b4ce01c4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -70,6 +70,15 @@ task:
   env:
     FILE_ENV: "./ci/test/00_setup_env_win64.sh"
 
+task:
+  name: '32-bit + dash  [GOAL: install]  [CentOS 8]  [gui]'
+  << : *GLOBAL_TASK_TEMPLATE
+  container:
+    image: centos:8
+  env:
+    PACKAGE_MANAGER_INSTALL: "yum install -y"
+    FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
+
 task:
   name: 'x86_64 Linux  [GOAL: install]  [bionic]  [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
   << : *GLOBAL_TASK_TEMPLATE
diff --git a/.travis.yml b/.travis.yml
index ea5390a0d8..dd76aaacaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,8 +64,3 @@ jobs:
         - set -o errexit; source ./ci/lint/05_before_script.sh
       script:
         - set -o errexit; source ./ci/lint/06_script.sh
-
-    - stage: test
-      name: '32-bit + dash  [GOAL: install]  [CentOS 8]  [gui]'
-      env: >-
-        FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
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
-- 
cgit v1.2.3