Skip to content

Commit b0190b0

Browse files
committed
wip
1 parent 16580d9 commit b0190b0

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

.cirrus.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ env: # Global defaults
99
CCACHE_DIR: "/tmp/ccache_dir"
1010
CCACHE_NOHASHDIR: "1" # Debug info might contain a stale path if the build dir changes, but this is fine
1111

12+
cirrus_ephemeral_worker_template_env: &CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
13+
DANGER_RUN_CI_ON_HOST: "1" # Containers will be discarded after the run, so there is no risk that the ci scripts modify the system
14+
1215
# https://cirrus-ci.org/guide/persistent-workers/
1316
#
1417
# It is possible to select a specific persistent worker by label. Refer to the
@@ -99,6 +102,7 @@ task:
99102
container:
100103
image: ubuntu:24.04
101104
env:
105+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
102106
FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
103107

104108
task:
@@ -107,6 +111,7 @@ task:
107111
container:
108112
image: docker.io/arm64v8/debian:bookworm
109113
env:
114+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
110115
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
111116

112117
task:
@@ -115,6 +120,7 @@ task:
115120
container:
116121
image: docker.io/amd64/ubuntu:22.04
117122
env:
123+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
118124
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
119125

120126
task:
@@ -123,6 +129,7 @@ task:
123129
container:
124130
image: quay.io/rockylinux/rockylinux:8
125131
env:
132+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
126133
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
127134

128135
task:
@@ -131,6 +138,7 @@ task:
131138
container:
132139
image: docker.io/debian:bullseye
133140
env:
141+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
134142
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
135143

136144
task:
@@ -139,6 +147,7 @@ task:
139147
container:
140148
image: docker.io/ubuntu:24.04
141149
env:
150+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
142151
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
143152

144153
task:
@@ -148,6 +157,7 @@ task:
148157
image: ubuntu:24.04
149158
timeout_in: 300m # Use longer timeout for the *rare* case where a full build (llvm + msan + depends + ...) needs to be done.
150159
env:
160+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
151161
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
152162

153163
task:
@@ -158,8 +168,9 @@ task:
158168
- sed -i "s|\${CIRRUS_CI}|true|g" ./ci/test/00_setup_env_native_asan.sh
159169
<< : *GLOBAL_TASK_TEMPLATE
160170
container:
161-
image: docker.io/ubuntu:23.10
171+
image: docker.io/ubuntu:24.04
162172
env:
173+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
163174
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
164175

165176
task:
@@ -168,6 +179,7 @@ task:
168179
container:
169180
image: ubuntu:24.04
170181
env:
182+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
171183
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
172184

173185
task:
@@ -176,6 +188,7 @@ task:
176188
container:
177189
image: docker.io/amd64/ubuntu:22.04
178190
env:
191+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
179192
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
180193

181194
task:
@@ -184,6 +197,7 @@ task:
184197
container:
185198
image: docker.io/debian:bullseye
186199
env:
200+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
187201
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
188202

189203
task:
@@ -192,4 +206,5 @@ task:
192206
container:
193207
image: docker.io/ubuntu:22.04
194208
env:
209+
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
195210
FILE_ENV: "./ci/test/00_setup_env_mac.sh"

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
export CONTAINER_NAME=ci_native_asan
1919
export PACKAGES="systemtap-sdt-dev clang-17 llvm-17 libclang-rt-17-dev python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
20-
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:23.10" # This version will reach EOL in Jul 2024, and can be replaced by "ubuntu:24.04" (or anything else that ships the wanted clang version).
20+
export CI_IMAGE_NAME_TAG="docker.io/ubuntu:24.04"
2121
export NO_DEPENDS=1
2222
export GOAL="install"
2323
export BITCOIN_CONFIG="--enable-c++20 --enable-usdt --enable-zmq --with-incompatible-bdb --with-gui=qt5 \

0 commit comments

Comments
 (0)