Skip to content

Commit 16580d9

Browse files
committed
wip cirrus
1 parent efdb51d commit 16580d9

File tree

1 file changed

+24
-36
lines changed

1 file changed

+24
-36
lines changed

.cirrus.yml

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -96,63 +96,56 @@ task:
9696
task:
9797
name: 'tidy'
9898
<< : *GLOBAL_TASK_TEMPLATE
99-
persistent_worker:
100-
labels:
101-
type: medium
99+
container:
100+
image: ubuntu:24.04
102101
env:
103102
FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
104103

105104
task:
106105
name: 'ARM, unit tests, no functional tests'
107106
<< : *GLOBAL_TASK_TEMPLATE
108-
persistent_worker:
109-
labels:
110-
type: arm64 # Use arm64 worker to sidestep qemu and avoid a slow CI: https://github.com/bitcoin/bitcoin/pull/28087#issuecomment-1649399453
107+
container:
108+
image: docker.io/arm64v8/debian:bookworm
111109
env:
112110
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
113111

114112
task:
115113
name: 'Win64, unit tests, no gui tests, no boost::process, no functional tests'
116114
<< : *GLOBAL_TASK_TEMPLATE
117-
persistent_worker:
118-
labels:
119-
type: small
115+
container:
116+
image: docker.io/amd64/ubuntu:22.04
120117
env:
121118
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
122119

123120
task:
124121
name: '32-bit Rocky8, dash, gui'
125122
<< : *GLOBAL_TASK_TEMPLATE
126-
persistent_worker:
127-
labels:
128-
type: small
123+
container:
124+
image: quay.io/rockylinux/rockylinux:8
129125
env:
130126
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
131127

132128
task:
133129
name: 'previous releases, qt5 dev package and depends packages, DEBUG'
134130
<< : *GLOBAL_TASK_TEMPLATE
135-
persistent_worker:
136-
labels:
137-
type: small
131+
container:
132+
image: docker.io/debian:bullseye
138133
env:
139134
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
140135

141136
task:
142137
name: 'TSan, depends, gui'
143138
<< : *GLOBAL_TASK_TEMPLATE
144-
persistent_worker:
145-
labels:
146-
type: medium
139+
container:
140+
image: docker.io/ubuntu:24.04
147141
env:
148142
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
149143

150144
task:
151145
name: 'MSan, depends'
152146
<< : *GLOBAL_TASK_TEMPLATE
153-
persistent_worker:
154-
labels:
155-
type: small
147+
container:
148+
image: ubuntu:24.04
156149
timeout_in: 300m # Use longer timeout for the *rare* case where a full build (llvm + msan + depends + ...) needs to be done.
157150
env:
158151
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
@@ -164,44 +157,39 @@ task:
164157
# so any settings will need to be written to the settings env file:
165158
- sed -i "s|\${CIRRUS_CI}|true|g" ./ci/test/00_setup_env_native_asan.sh
166159
<< : *GLOBAL_TASK_TEMPLATE
167-
persistent_worker:
168-
labels:
169-
type: mantic # Must use this specific worker (needed for USDT functional tests)
160+
container:
161+
image: docker.io/ubuntu:23.10
170162
env:
171163
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
172164

173165
task:
174166
name: 'fuzzer,address,undefined,integer, no depends'
175167
<< : *GLOBAL_TASK_TEMPLATE
176-
persistent_worker:
177-
labels:
178-
type: medium
168+
container:
169+
image: ubuntu:24.04
179170
env:
180171
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
181172

182173
task:
183174
name: 'multiprocess, i686, DEBUG'
184175
<< : *GLOBAL_TASK_TEMPLATE
185-
persistent_worker:
186-
labels:
187-
type: medium
176+
container:
177+
image: docker.io/amd64/ubuntu:22.04
188178
env:
189179
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
190180

191181
task:
192182
name: 'no wallet, libbitcoinkernel'
193183
<< : *GLOBAL_TASK_TEMPLATE
194-
persistent_worker:
195-
labels:
196-
type: small
184+
container:
185+
image: docker.io/debian:bullseye
197186
env:
198187
FILE_ENV: "./ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh"
199188

200189
task:
201190
name: 'macOS-cross 11.0, gui, no tests'
202191
<< : *GLOBAL_TASK_TEMPLATE
203-
persistent_worker:
204-
labels:
205-
type: small
192+
container:
193+
image: docker.io/ubuntu:22.04
206194
env:
207195
FILE_ENV: "./ci/test/00_setup_env_mac.sh"

0 commit comments

Comments
 (0)