Skip to content

Commit fa810fa

Browse files
ReverseControlReverseControl
authored
Merge pull request #16 from patricklodder/ci/cleanup
ci: enable potentially successful cirrus runs
2 parents d43e959 + 07b12ec commit fa810fa

5 files changed

Lines changed: 94 additions & 126 deletions

File tree

‎.cirrus.yml‎

Lines changed: 75 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -83,140 +83,92 @@ task:
8383
env:
8484
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
8585

86-
task:
87-
name: 'ARM [unit tests, no functional tests] [buster]'
88-
<< : *GLOBAL_TASK_TEMPLATE
89-
container:
90-
image: debian:buster
91-
env:
92-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
93-
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
94-
95-
task:
96-
name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]'
97-
<< : *GLOBAL_TASK_TEMPLATE
98-
container:
99-
image: ubuntu:focal
100-
env:
101-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
102-
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
103-
104-
task:
105-
name: '32-bit + dash [gui] [CentOS 8]'
106-
<< : *GLOBAL_TASK_TEMPLATE
107-
container:
108-
image: centos:8
109-
env:
110-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
111-
PACKAGE_MANAGER_INSTALL: "yum install -y"
112-
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
113-
114-
task:
115-
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bionic]'
116-
previous_releases_cache:
117-
folder: "releases"
118-
<< : *GLOBAL_TASK_TEMPLATE
119-
<< : *PERSISTENT_WORKER_TEMPLATE
120-
env:
121-
<< : *PERSISTENT_WORKER_TEMPLATE_ENV
122-
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
123-
124-
task:
125-
name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]'
126-
<< : *GLOBAL_TASK_TEMPLATE
127-
container:
128-
image: ubuntu:hirsute
129-
cpu: 6 # Increase CPU and Memory to avoid timeout
130-
memory: 24G
131-
env:
132-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
133-
MAKEJOBS: "-j8"
134-
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
86+
#task:
87+
# name: 'ARM [unit tests, no functional tests] [buster]'
88+
# << : *GLOBAL_TASK_TEMPLATE
89+
# container:
90+
# image: debian:buster
91+
# env:
92+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
93+
# FILE_ENV: "./ci/test/00_setup_env_arm.sh"
13594

136-
task:
137-
name: '[depends, sanitizers: memory (MSan)] [focal]'
138-
<< : *GLOBAL_TASK_TEMPLATE
139-
container:
140-
image: ubuntu:focal
141-
env:
142-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
143-
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
95+
#task:
96+
# name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]'
97+
# << : *GLOBAL_TASK_TEMPLATE
98+
# container:
99+
# image: ubuntu:focal
100+
# env:
101+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
102+
# FILE_ENV: "./ci/test/00_setup_env_win64.sh"
144103

145-
task:
146-
name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]'
147-
<< : *GLOBAL_TASK_TEMPLATE
148-
container:
149-
image: ubuntu:hirsute
150-
env:
151-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
152-
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
104+
#task:
105+
# name: '[depends, sanitizers: thread (TSan), no gui] [hirsute]'
106+
# << : *GLOBAL_TASK_TEMPLATE
107+
# container:
108+
# image: ubuntu:hirsute
109+
# cpu: 6 # Increase CPU and Memory to avoid timeout
110+
# memory: 24G
111+
# env:
112+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
113+
# FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
153114

154-
task:
155-
name: '[no depends, sanitizers: fuzzer,address,undefined,integer] [focal]'
156-
only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
157-
<< : *GLOBAL_TASK_TEMPLATE
158-
container:
159-
image: ubuntu:focal
160-
cpu: 4 # Increase CPU and memory to avoid timeout
161-
memory: 16G
162-
env:
163-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
164-
MAKEJOBS: "-j8"
165-
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
115+
#task:
116+
# name: '[depends, sanitizers: memory (MSan)] [focal]'
117+
# << : *GLOBAL_TASK_TEMPLATE
118+
# container:
119+
# image: ubuntu:focal
120+
# env:
121+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
122+
# FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
166123

167-
task:
168-
name: '[multiprocess, DEBUG] [focal]'
169-
<< : *GLOBAL_TASK_TEMPLATE
170-
container:
171-
image: ubuntu:focal
172-
cpu: 4
173-
memory: 16G # The default memory is sometimes just a bit too small, so double everything
174-
env:
175-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
176-
MAKEJOBS: "-j8"
177-
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
124+
#task:
125+
# name: '[no depends, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [hirsute]'
126+
# << : *GLOBAL_TASK_TEMPLATE
127+
# container:
128+
# image: ubuntu:hirsute
129+
# env:
130+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
131+
# FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
178132

179-
task:
180-
name: '[no wallet] [bionic]'
181-
<< : *GLOBAL_TASK_TEMPLATE
182-
container:
183-
image: ubuntu:bionic
184-
env:
185-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
186-
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
133+
#task:
134+
# name: '[no depends, sanitizers: fuzzer,address,undefined,integer] [focal]'
135+
# only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
136+
# << : *GLOBAL_TASK_TEMPLATE
137+
# container:
138+
# image: ubuntu:focal
139+
# cpu: 4 # Increase CPU and memory to avoid timeout
140+
# memory: 16G
141+
# env:
142+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
143+
# MAKEJOBS: "-j8"
144+
# FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
187145

188-
task:
189-
name: 'macOS 10.14 [gui, no tests] [focal]'
190-
<< : *DEPENDS_SDK_CACHE_TEMPLATE
191-
<< : *GLOBAL_TASK_TEMPLATE
192-
container:
193-
image: ubuntu:focal
194-
env:
195-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
196-
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
146+
#task:
147+
# name: '[multiprocess, DEBUG] [focal]'
148+
# << : *GLOBAL_TASK_TEMPLATE
149+
# container:
150+
# image: ubuntu:focal
151+
# cpu: 4
152+
# memory: 16G # The default memory is sometimes just a bit too small, so double everything
153+
# env:
154+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
155+
# MAKEJOBS: "-j8"
156+
# FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
197157

198-
task:
199-
name: 'macOS 11 native [gui] [no depends]'
200-
brew_install_script:
201-
- brew install boost libevent berkeley-db4 qt@5 miniupnpc libnatpmp ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
202-
<< : *GLOBAL_TASK_TEMPLATE
203-
osx_instance:
204-
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
205-
image: big-sur-xcode-12.5 # https://cirrus-ci.org/guide/macOS
206-
env:
207-
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
208-
CI_USE_APT_INSTALL: "no"
209-
PACKAGE_MANAGER_INSTALL: "echo" # Nothing to do
210-
FILE_ENV: "./ci/test/00_setup_env_mac_host.sh"
158+
#task:
159+
# name: '[no wallet] [bionic]'
160+
# << : *GLOBAL_TASK_TEMPLATE
161+
# container:
162+
# image: ubuntu:bionic
163+
# env:
164+
# << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
165+
# FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
211166

212167
task:
213-
name: 'ARM64 Android APK [focal]'
214-
<< : *DEPENDS_SDK_CACHE_TEMPLATE
215-
depends_sources_cache:
216-
folder: "depends/sources"
168+
name: '[depends] [focal]'
217169
<< : *GLOBAL_TASK_TEMPLATE
218170
container:
219171
image: ubuntu:focal
220172
env:
221173
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
222-
FILE_ENV: "./ci/test/00_setup_env_android.sh"
174+
FILE_ENV: "./ci/test/00_setup_env_native_plain.sh"

‎ci/test/00_setup_env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out/$HOST}
6565
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
6666
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/releases/$HOST}
6767
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
68-
export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison}
68+
export DOCKER_PACKAGES=${DOCKER_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison unzip}
6969
export GOAL=${GOAL:-install}
7070
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}
7171
export PATH=${BASE_ROOT_DIR}/ci/retry:$PATH

‎ci/test/00_setup_env_native_plain.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Copyright (c) 2020 The Bitcoin Core developers
4+
# Distributed under the MIT software license, see the accompanying
5+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
6+
7+
export LC_ALL=C.UTF-8
8+
9+
export CONTAINER_NAME=ci_native_plain
10+
export DOCKER_NAME_TAG=ubuntu:20.04
11+
export GOAL="install"
12+
export BITCOIN_CONFIG="--disable-tests --disable-bench" # Use clang to avoid OOM
13+
14+
# disabled until unit & functional tests are fully ported
15+
export RUN_UNIT_TESTS=false
16+
export RUN_FUNCTIONAL_TESTS=false

‎ci/test/06_script_a.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ DOCKER_EXEC "${BASE_ROOT_DIR}/configure" --cache-file=config.cache $BITCOIN_CONF
3333

3434
DOCKER_EXEC make distdir VERSION=$HOST
3535

36-
export P_CI_DIR="${BASE_BUILD_DIR}/factorn-$HOST"
36+
export P_CI_DIR="${BASE_BUILD_DIR}/Fact0rN-$HOST"
3737

3838
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (DOCKER_EXEC cat config.log) && false)
3939

‎depends/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SOURCES_PATH ?= $(BASEDIR)/sources
3232
WORK_PATH = $(BASEDIR)/work
3333
BASE_CACHE ?= $(BASEDIR)/built
3434
SDK_PATH ?= $(BASEDIR)/SDKs
35-
NO_QT ?=
35+
NO_QT ?= 1
3636
NO_QR ?=
3737
NO_BDB ?=
3838
NO_SQLITE ?=

0 commit comments

Comments
 (0)