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
This commit is contained in:
MarcoFalke 2020-11-23 21:02:11 +01:00 committed by Konstantin Akimov
parent f217e0ae7b
commit fcb4c20802
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
4 changed files with 21 additions and 12 deletions

View File

@ -52,13 +52,22 @@ task:
QEMU_USER_CMD: "" # Disable qemu and run the test natively QEMU_USER_CMD: "" # Disable qemu and run the test natively
task: 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 << : *GLOBAL_TASK_TEMPLATE
container: container:
image: ubuntu:bionic image: ubuntu:focal
env: env:
FILE_ENV: "./ci/test/00_setup_env_win64.sh" 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: task:
name: 'x86_64 Linux [GOAL: install] [focal] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]' name: 'x86_64 Linux [GOAL: install] [focal] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
@ -110,6 +119,14 @@ task:
env: env:
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh" 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: task:
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]' name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
@ -119,7 +136,7 @@ task:
FILE_ENV: "./ci/test/00_setup_env_mac.sh" FILE_ENV: "./ci/test/00_setup_env_mac.sh"
task: 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: macos_brew_addon_script:
- brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt - brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE

View File

@ -184,8 +184,3 @@ after_success:
- set -o errexit; source ./ci/lint/05_before_script.sh - set -o errexit; source ./ci/lint/05_before_script.sh
script: script:
- set -o errexit; source ./ci/lint/06_script.sh - 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"

View File

@ -6,9 +6,6 @@
export LC_ALL=C.UTF-8 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 if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
export LC_ALL=C export LC_ALL=C
fi fi

View File

@ -29,7 +29,7 @@ if [ -z "$NO_DEPENDS" ]; then
# CentOS has problems building the depends if the config shell is not explicitly set # 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 # (i.e. for libevent a Makefile with an empty SHELL variable is generated, leading to
# an error as the first command is executed) # 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 else
SHELL_OPTS="CONFIG_SHELL=" SHELL_OPTS="CONFIG_SHELL="
fi fi