Skip to content

Commit fcb4c20

Browse files
MarcoFalkeknst
authored andcommitted
Merge bitcoin#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
1 parent f217e0a commit fcb4c20

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.cirrus.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,22 @@ task:
5252
QEMU_USER_CMD: "" # Disable qemu and run the test natively
5353

5454
task:
55-
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]'
55+
name: 'Win64 [GOAL: deploy] [unit tests, no gui tests, no boost::process, no functional tests]'
5656
<< : *GLOBAL_TASK_TEMPLATE
5757
container:
58-
image: ubuntu:bionic
58+
image: ubuntu:focal
5959
env:
6060
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
6161

62+
task:
63+
name: '32-bit + dash [GOAL: install] [CentOS 8] [gui]'
64+
<< : *GLOBAL_TASK_TEMPLATE
65+
container:
66+
image: centos:8
67+
env:
68+
PACKAGE_MANAGER_INSTALL: "yum install -y"
69+
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
70+
6271
task:
6372
name: 'x86_64 Linux [GOAL: install] [focal] [previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
6473
<< : *GLOBAL_TASK_TEMPLATE
@@ -110,6 +119,14 @@ task:
110119
env:
111120
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
112121

122+
task:
123+
name: 'x86_64 Linux [GOAL: install] [focal] [no wallet]'
124+
<< : *GLOBAL_TASK_TEMPLATE
125+
container:
126+
image: ubuntu:focal
127+
env:
128+
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
129+
113130
task:
114131
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
115132
<< : *GLOBAL_TASK_TEMPLATE
@@ -119,7 +136,7 @@ task:
119136
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
120137

121138
task:
122-
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
139+
name: 'macOS 10.15 native [GOAL: install] [GUI] [no depends]'
123140
macos_brew_addon_script:
124141
- brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
125142
<< : *GLOBAL_TASK_TEMPLATE

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,3 @@ after_success:
184184
- set -o errexit; source ./ci/lint/05_before_script.sh
185185
script:
186186
- set -o errexit; source ./ci/lint/06_script.sh
187-
188-
- stage: test
189-
name: 'x86_64 Linux [GOAL: install] [focal] [no wallet]'
190-
env: >-
191-
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"

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

0 commit comments

Comments
 (0)