From fcb4c20802b602e3c3dcad57acbb3fefad49b7b3 Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 23 Nov 2020 21:02:11 +0100
Subject: [PATCH] Merge #19179: ci: Run ci configs on cirrus

fa7a4385d08797876de9a05ae8a6fde18e36bd67 ci: Fix doc typos in .cirrus.yml (MarcoFalke)
fa73674738b0b5a271ae387e2ebd76d747e02d91 ci: Run i686 centos ci config on cirrus (MarcoFalke)
fa1f949a4dc2568456f3ba30bbd8ecbc78a423ca ci: Run nowallet ci config on cirrus (MarcoFalke)

Pull request description:

  Travis CI Org is shutting down, so move the configs to cirrus ci

ACKs for top commit:
  practicalswift:
    ACK fa7a4385d08797876de9a05ae8a6fde18e36bd67: patch looks correct

Tree-SHA512: 1b7125c7f0d2288931fb8c5e90345891d5f7c1f00c4af136afbeb36bd2836f72920a1877dacc7be787e2c8d84de2a733c1ca71931e5c101b222c1fea588619b3
---
 .cirrus.yml                 | 23 ++++++++++++++++++++---
 .travis.yml                 |  5 -----
 ci/test/04_install.sh       |  3 ---
 ci/test/05_before_script.sh |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 29e08e89b8..a8793dfd74 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -52,13 +52,22 @@ task:
     QEMU_USER_CMD: ""  # Disable qemu and run the test natively
 
 task:
-  name: 'Win64  [GOAL: deploy]  [unit tests, no gui, no boost::process, no functional tests]'
+  name: 'Win64  [GOAL: deploy]  [unit tests, no gui tests, no boost::process, no functional tests]'
   << : *GLOBAL_TASK_TEMPLATE
   container:
-    image: ubuntu:bionic
+    image: ubuntu:focal
   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]  [focal]  [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
   << : *GLOBAL_TASK_TEMPLATE
@@ -110,6 +119,14 @@ task:
   env:
     FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
 
+task:
+  name: 'x86_64 Linux  [GOAL: install]  [focal]  [no wallet]'
+  << : *GLOBAL_TASK_TEMPLATE
+  container:
+    image: ubuntu:focal
+  env:
+    FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
+
 task:
   name: 'macOS 10.12  [GOAL: deploy] [no functional tests]'
   << : *GLOBAL_TASK_TEMPLATE
@@ -119,7 +136,7 @@ task:
     FILE_ENV: "./ci/test/00_setup_env_mac.sh"
 
 task:
-  name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
+  name: 'macOS 10.15 native [GOAL: install] [GUI] [no depends]'
   macos_brew_addon_script:
     - brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
   << : *GLOBAL_TASK_TEMPLATE
diff --git a/.travis.yml b/.travis.yml
index 26311af385..a9017035c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,8 +184,3 @@ after_success:
         - set -o errexit; source ./ci/lint/05_before_script.sh
       script:
         - set -o errexit; source ./ci/lint/06_script.sh
-
-    - stage: test
-      name: 'x86_64 Linux  [GOAL: install]  [focal]  [no wallet]'
-      env: >-
-        FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
diff --git a/ci/test/04_install.sh b/ci/test/04_install.sh
index 721f9d1191..967e437fc0 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 1c595a7573..5875a0ec9f 100755
--- a/ci/test/05_before_script.sh
+++ b/ci/test/05_before_script.sh
@@ -29,7 +29,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