Skip to content

Commit 90bc040

Browse files
committed
adjust blocking jobs
1 parent 511ff99 commit 90bc040

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

.github/workflows/release_builds.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
183183
build_amd_debug:
184184
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
185-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_amd_binary, build_arm_release, build_arm_binary]
185+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
186186
name: "Build (amd_debug)"
187187
outputs:
188188
data: ${{ steps.run.outputs.DATA }}
@@ -276,7 +276,7 @@ jobs:
276276
277277
build_amd_asan:
278278
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
279-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_amd_binary, build_arm_release, build_arm_binary]
279+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
280280
name: "Build (amd_asan)"
281281
outputs:
282282
data: ${{ steps.run.outputs.DATA }}
@@ -323,7 +323,7 @@ jobs:
323323
324324
build_amd_tsan:
325325
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
326-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_amd_binary, build_arm_release, build_arm_binary]
326+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
327327
name: "Build (amd_tsan)"
328328
outputs:
329329
data: ${{ steps.run.outputs.DATA }}
@@ -370,7 +370,7 @@ jobs:
370370
371371
build_amd_msan:
372372
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
373-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_amd_binary, build_arm_release, build_arm_binary]
373+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
374374
name: "Build (amd_msan)"
375375
outputs:
376376
data: ${{ steps.run.outputs.DATA }}
@@ -417,7 +417,7 @@ jobs:
417417
418418
build_amd_ubsan:
419419
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
420-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release, build_amd_binary, build_arm_release, build_arm_binary]
420+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, build_arm_binary]
421421
name: "Build (amd_ubsan)"
422422
outputs:
423423
data: ${{ steps.run.outputs.DATA }}

ci/workflows/release_builds.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,12 @@
1010
if "coverage" not in job.name
1111
]
1212

13-
PRIORITY_BUILD_JOBS = [
13+
# Make sure that builds that get tested are built first
14+
# Note that the release build job should not block or be blocked, it is long and it's dependencies are fast.
15+
BLOCKING_BUILD_JOBS = [
1416
job.name
1517
for job in JobConfigs.build_jobs
16-
if any(
17-
substr in job.name
18-
for substr in (
19-
"binary",
20-
"release",
21-
)
22-
)
18+
if any(substr in job.name for substr in ["binary"])
2319
]
2420

2521
workflow = Workflow.Config(
@@ -28,7 +24,9 @@
2824
jobs=[
2925
*[
3026
job.set_dependency(
31-
PRIORITY_BUILD_JOBS if job.name not in PRIORITY_BUILD_JOBS else []
27+
BLOCKING_BUILD_JOBS
28+
if job.name not in BLOCKING_BUILD_JOBS and "release" not in job.name
29+
else []
3230
)
3331
for job in builds_for_release_branch
3432
],

0 commit comments

Comments
 (0)