Skip to content

Commit b85a40b

Browse files
committed
ci: Change display names to avoid on-cancellation quirk (leanprover-community#34794)
It seems like cancelled jobs are not resolving the suffix correctly, so let's push the disambiguation to the upper UI layer
1 parent 5b38ccd commit b85a40b

5 files changed

Lines changed: 8 additions & 12 deletions

File tree

.github/workflows/bors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ permissions:
2020

2121
jobs:
2222
build:
23+
name: ci (staging)
2324
if: ${{ github.repository == 'leanprover-community/mathlib4' || github.repository == 'leanprover-community/mathlib4-nightly-testing' }}
2425
uses: ./.github/workflows/build_template.yml
2526
with:
2627
concurrency_group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}
2728
pr_branch_ref: ${{ github.sha }}
28-
job_name_suffix: ""
2929
# We don't wan't 'bors try' runs to compete with merge-candidates, so we pool trying with PR runs
3030
runs_on: ${{ github.ref_name == 'trying' && 'pr' || 'bors' }}
3131
secrets: inherit

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ permissions:
2727

2828
jobs:
2929
build:
30+
name: ci
3031
if: ${{ github.repository == 'leanprover-community/mathlib4' || github.repository == 'leanprover-community/mathlib4-nightly-testing' }}
3132
uses: ./.github/workflows/build_template.yml
3233
with:
3334
concurrency_group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.event_name == 'push' && github.ref == 'refs/heads/master' && github.run_id) || '' }}
3435
pr_branch_ref: ${{ github.sha }}
35-
job_name_suffix: ""
3636
runs_on: pr
3737
secrets: inherit

.github/workflows/build_fork.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ permissions:
2929

3030
jobs:
3131
build:
32+
name: ci (fork)
3233
if: ${{ github.event.pull_request.head.repo.fork && github.repository != 'leanprover-community/mathlib4-nightly-testing' }}
3334
uses: ./.github/workflows/build_template.yml
3435
with:
3536
concurrency_group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
3637
pr_branch_ref: ${{ github.event.pull_request.head.sha }}
37-
job_name_suffix: ' (fork)'
3838
runs_on: pr
3939
secrets: inherit

.github/workflows/build_template.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ on:
99
pr_branch_ref:
1010
type: string
1111
required: true
12-
job_name_suffix:
13-
type: string
14-
required: false
15-
default: ""
1612
runs_on:
1713
type: string
1814
required: true
@@ -27,7 +23,7 @@ env:
2723

2824
jobs:
2925
build:
30-
name: Build${{ inputs.job_name_suffix }}
26+
name: Build
3127
runs-on: ${{ inputs.runs_on }}
3228
outputs:
3329
build-outcome: ${{ steps.build.outcome }}
@@ -599,7 +595,7 @@ jobs:
599595
master-branch/scripts/lean-pr-testing-comments.sh batteries
600596
601597
post_steps:
602-
name: Post-Build Step${{ inputs.job_name_suffix }}
598+
name: Post-Build Step
603599
needs: [build]
604600
runs-on: ubuntu-latest # Note these steps run on disposable GitHub runners, so no landrun sandboxing is needed.
605601
steps:
@@ -678,7 +674,7 @@ jobs:
678674
# We no longer run `lean4checker` in regular CI, as it is quite expensive for little benefit.
679675
# Instead we run it in a cron job on master: see `daily.yml`.
680676
style_lint:
681-
name: Lint style${{ inputs.job_name_suffix }}
677+
name: Lint style
682678
runs-on: ubuntu-latest
683679
steps:
684680
- uses: leanprover-community/lint-style-action@a7e7428fa44f9635d6eb8e01919d16fd498d387a # 2025-08-18
@@ -688,7 +684,7 @@ jobs:
688684
ref: ${{ inputs.pr_branch_ref }}
689685

690686
final:
691-
name: Post-CI job${{ inputs.job_name_suffix }}
687+
name: Post-CI job
692688
needs: [style_lint, build, post_steps]
693689
runs-on: ubuntu-latest
694690
steps:

bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
status = ["build / Build", "build / Lint style", "build / Post-Build Step"]
1+
status = ["ci (staging) / Build", "ci (staging) / Lint style", "ci (staging) / Post-Build Step", "ci (staging) / Post-CI job"]
22
use_squash_merge = true
33
timeout_sec = 7200
44
block_labels = ["WIP", "blocked-by-other-PR", "merge-conflict", "awaiting-CI"]

0 commit comments

Comments
 (0)