Skip to content

Commit cb89e18

Browse files
author
MarcoFalke
committed
Merge #19179: ci: Run ci configs on cirrus
fa7a438 ci: Fix doc typos in .cirrus.yml (MarcoFalke) fa73674 ci: Run i686 centos ci config on cirrus (MarcoFalke) fa1f949 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 fa7a438: patch looks correct Tree-SHA512: 1b7125c7f0d2288931fb8c5e90345891d5f7c1f00c4af136afbeb36bd2836f72920a1877dacc7be787e2c8d84de2a733c1ca71931e5c101b222c1fea588619b3
2 parents 2ee954d + fa7a438 commit cb89e18

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

.cirrus.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,24 @@ task:
6363
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
6464

6565
task:
66-
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]'
66+
name: 'Win64 [GOAL: deploy] [unit tests, no gui tests, no boost::process, no functional tests]'
6767
<< : *GLOBAL_TASK_TEMPLATE
6868
container:
6969
image: ubuntu:bionic
7070
env:
7171
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
7272

7373
task:
74-
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
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+
82+
task:
83+
name: 'x86_64 Linux [GOAL: install] [bionic] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
7584
<< : *GLOBAL_TASK_TEMPLATE
7685
container:
7786
image: ubuntu:bionic
@@ -121,6 +130,14 @@ task:
121130
env:
122131
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
123132

133+
task:
134+
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
135+
<< : *GLOBAL_TASK_TEMPLATE
136+
container:
137+
image: ubuntu:bionic
138+
env:
139+
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
140+
124141
task:
125142
name: 'macOS 10.14 [GOAL: deploy] [no functional tests]'
126143
<< : *GLOBAL_TASK_TEMPLATE
@@ -130,7 +147,7 @@ task:
130147
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
131148

132149
task:
133-
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
150+
name: 'macOS 10.15 native [GOAL: install] [GUI] [no depends]'
134151
macos_brew_addon_script:
135152
- brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
136153
<< : *GLOBAL_TASK_TEMPLATE

.travis.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +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"
72-
73-
- stage: test
74-
name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
75-
env: >-
76-
FILE_ENV="./ci/test/00_setup_env_native_nowallet.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)