@@ -112,26 +112,27 @@ jobs:
112112 runs-on-amd64 : ${{ needs.check-skip.outputs['runner-amd64'] }}
113113 runs-on-arm64 : ${{ needs.check-skip.outputs['runner-arm64'] }}
114114
115- depends-aarch64-linux :
116- name : aarch64-linux-gnu
115+ depends-linux64 :
116+ name : linux64 (native)
117117 uses : ./.github/workflows/build-depends.yml
118118 needs : [check-skip, container, cache-sources]
119- if : ${{ vars.SKIP_ARM_LINUX == '' }}
119+ if : |
120+ vars.SKIP_LINUX64 == '' ||
121+ vars.SKIP_LINUX64_FUZZ == '' ||
122+ vars.SKIP_LINUX64_SQLITE == ''
120123 with :
121- build-target : aarch64-linux
124+ build-target : linux64
122125 container-path : ${{ needs.container.outputs.path }}
123126 base-image-digest : ${{ needs.check-skip.outputs.base-image-digest }}
124- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
127+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
125128
126- depends-linux64 :
127- name : x86_64-pc-linux-gnu
129+ depends-linux64-x86 :
130+ name : linux64 (x86 canary)
128131 uses : ./.github/workflows/build-depends.yml
129132 needs : [check-skip, container, cache-sources]
130133 if : |
131- vars.SKIP_LINUX64 == '' ||
132- vars.SKIP_LINUX64_FUZZ == '' ||
133- vars.SKIP_LINUX64_SQLITE == '' ||
134- vars.SKIP_LINUX64_UBSAN == ''
134+ vars.SKIP_LINUX64_UBSAN == '' ||
135+ vars.SKIP_LINUX64_X86CANARY == ''
135136 with :
136137 build-target : linux64
137138 container-path : ${{ needs.container.outputs.path }}
@@ -142,25 +143,34 @@ jobs:
142143 name : linux64_multiprocess
143144 uses : ./.github/workflows/build-depends.yml
144145 needs : [check-skip, container, cache-sources]
145- if : |
146- vars.SKIP_LINUX64_MULTIPROCESS == '' ||
147- vars.SKIP_LINUX64_TSAN == ''
146+ if : ${{ vars.SKIP_LINUX64_TSAN == '' }}
148147 with :
149148 build-target : linux64_multiprocess
150149 container-path : ${{ needs.container.outputs.path }}
151150 base-image-digest : ${{ needs.check-skip.outputs.base-image-digest }}
152151 runs-on : ${{ needs.check-skip.outputs['runner-arm64'] }}
153152
153+ depends-linux64_multiprocess-x86 :
154+ name : linux64_multiprocess (x86)
155+ uses : ./.github/workflows/build-depends.yml
156+ needs : [check-skip, container, cache-sources]
157+ if : ${{ vars.SKIP_LINUX64_MULTIPROCESS == '' }}
158+ with :
159+ build-target : linux64_multiprocess
160+ container-path : ${{ needs.container.outputs.path }}
161+ base-image-digest : ${{ needs.check-skip.outputs.base-image-digest }}
162+ runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
163+
154164 depends-linux64_nowallet :
155- name : x86_64-pc-linux-gnu_nowallet
165+ name : linux64_nowallet (native)
156166 uses : ./.github/workflows/build-depends.yml
157167 needs : [check-skip, container, cache-sources]
158168 if : ${{ vars.SKIP_LINUX64_NOWALLET == '' }}
159169 with :
160170 build-target : linux64_nowallet
161171 container-path : ${{ needs.container.outputs.path }}
162172 base-image-digest : ${{ needs.check-skip.outputs.base-image-digest }}
163- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
173+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
164174
165175 depends-mac :
166176 name : x86_64-apple-darwin
@@ -192,18 +202,6 @@ jobs:
192202 container-path : ${{ needs.container-slim.outputs.path }}
193203 runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
194204
195- src-aarch64-linux :
196- name : aarch64-linux-build
197- uses : ./.github/workflows/build-src.yml
198- needs : [check-skip, container, depends-aarch64-linux]
199- with :
200- build-target : aarch64-linux
201- container-path : ${{ needs.container.outputs.path }}
202- depends-key : ${{ needs.depends-aarch64-linux.outputs.key }}
203- depends-host : ${{ needs.depends-aarch64-linux.outputs.host }}
204- depends-dep-opts : ${{ needs.depends-aarch64-linux.outputs.dep-opts }}
205- runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
206-
207205 src-linux64 :
208206 name : linux64-build
209207 uses : ./.github/workflows/build-src.yml
@@ -215,7 +213,7 @@ jobs:
215213 depends-key : ${{ needs.depends-linux64.outputs.key }}
216214 depends-host : ${{ needs.depends-linux64.outputs.host }}
217215 depends-dep-opts : ${{ needs.depends-linux64.outputs.dep-opts }}
218- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
216+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
219217
220218 src-linux64_fuzz :
221219 name : linux64_fuzz-build
@@ -228,20 +226,20 @@ jobs:
228226 depends-key : ${{ needs.depends-linux64.outputs.key }}
229227 depends-host : ${{ needs.depends-linux64.outputs.host }}
230228 depends-dep-opts : ${{ needs.depends-linux64.outputs.dep-opts }}
231- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
229+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
232230
233231 src-linux64_multiprocess :
234232 name : linux64_multiprocess-build
235233 uses : ./.github/workflows/build-src.yml
236- needs : [check-skip, container, depends-linux64_multiprocess, lint]
234+ needs : [check-skip, container, depends-linux64_multiprocess-x86 , lint]
237235 if : ${{ vars.SKIP_LINUX64_MULTIPROCESS == '' }}
238236 with :
239237 build-target : linux64_multiprocess
240238 container-path : ${{ needs.container.outputs.path }}
241- depends-key : ${{ needs.depends-linux64_multiprocess.outputs.key }}
242- depends-host : ${{ needs.depends-linux64_multiprocess.outputs.host }}
243- depends-dep-opts : ${{ needs.depends-linux64_multiprocess.outputs.dep-opts }}
244- runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
239+ depends-key : ${{ needs.depends-linux64_multiprocess-x86 .outputs.key }}
240+ depends-host : ${{ needs.depends-linux64_multiprocess-x86 .outputs.host }}
241+ depends-dep-opts : ${{ needs.depends-linux64_multiprocess-x86 .outputs.dep-opts }}
242+ runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
245243
246244 src-linux64_nowallet :
247245 name : linux64_nowallet-build
@@ -253,7 +251,7 @@ jobs:
253251 depends-key : ${{ needs.depends-linux64_nowallet.outputs.key }}
254252 depends-host : ${{ needs.depends-linux64_nowallet.outputs.host }}
255253 depends-dep-opts : ${{ needs.depends-linux64_nowallet.outputs.dep-opts }}
256- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
254+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
257255
258256 src-linux64_sqlite :
259257 name : linux64_sqlite-build
@@ -266,7 +264,7 @@ jobs:
266264 depends-key : ${{ needs.depends-linux64.outputs.key }}
267265 depends-host : ${{ needs.depends-linux64.outputs.host }}
268266 depends-dep-opts : ${{ needs.depends-linux64.outputs.dep-opts }}
269- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
267+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
270268
271269 src-linux64_tsan :
272270 name : linux64_tsan-build
@@ -284,14 +282,27 @@ jobs:
284282 src-linux64_ubsan :
285283 name : linux64_ubsan-build
286284 uses : ./.github/workflows/build-src.yml
287- needs : [check-skip, container, depends-linux64]
285+ needs : [check-skip, container, depends-linux64-x86 ]
288286 if : ${{ vars.SKIP_LINUX64_UBSAN == '' }}
289287 with :
290288 build-target : linux64_ubsan
291289 container-path : ${{ needs.container.outputs.path }}
292- depends-key : ${{ needs.depends-linux64.outputs.key }}
293- depends-host : ${{ needs.depends-linux64.outputs.host }}
294- depends-dep-opts : ${{ needs.depends-linux64.outputs.dep-opts }}
290+ depends-key : ${{ needs.depends-linux64-x86.outputs.key }}
291+ depends-host : ${{ needs.depends-linux64-x86.outputs.host }}
292+ depends-dep-opts : ${{ needs.depends-linux64-x86.outputs.dep-opts }}
293+ runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
294+
295+ src-linux64_x86canary :
296+ name : linux64_x86canary-build
297+ uses : ./.github/workflows/build-src.yml
298+ needs : [check-skip, container, depends-linux64-x86]
299+ if : ${{ vars.SKIP_LINUX64_X86CANARY == '' }}
300+ with :
301+ build-target : linux64_x86canary
302+ container-path : ${{ needs.container.outputs.path }}
303+ depends-key : ${{ needs.depends-linux64-x86.outputs.key }}
304+ depends-host : ${{ needs.depends-linux64-x86.outputs.host }}
305+ depends-dep-opts : ${{ needs.depends-linux64-x86.outputs.dep-opts }}
295306 runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
296307
297308 src-mac :
@@ -326,7 +337,7 @@ jobs:
326337 bundle-key : ${{ needs.src-linux64.outputs.key }}
327338 build-target : linux64
328339 container-path : ${{ needs.container-slim.outputs.path }}
329- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
340+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
330341
331342 test-linux64_multiprocess :
332343 name : linux64_multiprocess-test
@@ -336,7 +347,7 @@ jobs:
336347 bundle-key : ${{ needs.src-linux64_multiprocess.outputs.key }}
337348 build-target : linux64_multiprocess
338349 container-path : ${{ needs.container-slim.outputs.path }}
339- runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
350+ runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
340351
341352 test-linux64_nowallet :
342353 name : linux64_nowallet-test
@@ -346,7 +357,7 @@ jobs:
346357 bundle-key : ${{ needs.src-linux64_nowallet.outputs.key }}
347358 build-target : linux64_nowallet
348359 container-path : ${{ needs.container-slim.outputs.path }}
349- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
360+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
350361
351362 test-linux64_sqlite :
352363 name : linux64_sqlite-test
@@ -356,7 +367,7 @@ jobs:
356367 bundle-key : ${{ needs.src-linux64_sqlite.outputs.key }}
357368 build-target : linux64_sqlite
358369 container-path : ${{ needs.container-slim.outputs.path }}
359- runs-on : ${{ needs.check-skip.outputs['runner-amd64 '] }}
370+ runs-on : ${{ needs.check-skip.outputs['runner-arm64 '] }}
360371
361372 test-linux64_tsan :
362373 name : linux64_tsan-test
@@ -377,3 +388,14 @@ jobs:
377388 build-target : linux64_ubsan
378389 container-path : ${{ needs.container-slim.outputs.path }}
379390 runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
391+
392+ test-linux64_x86canary :
393+ name : linux64_x86canary-test
394+ uses : ./.github/workflows/test-src.yml
395+ needs : [check-skip, container-slim, src-linux64_x86canary, lint]
396+ with :
397+ bundle-key : ${{ needs.src-linux64_x86canary.outputs.key }}
398+ build-target : linux64_x86canary
399+ container-path : ${{ needs.container-slim.outputs.path }}
400+ runs-on : ${{ needs.check-skip.outputs['runner-amd64'] }}
401+ integration-tests-args : " --exclude feature_pruning,feature_dbcrash"
0 commit comments