.github: include workflow name in concurrency ID

This hopefully fixes PRs failing as "cancelled". Drive-by cleanup
old branch name while we're at it.

commit-id:ec0076e0
This commit is contained in:
Leo 2022-02-07 23:28:54 +01:00 committed by Leopold Schabel
parent 6c02299f2b
commit cf3f6def68
1 changed files with 2 additions and 3 deletions

View File

@ -5,7 +5,6 @@ on:
push: push:
branches: branches:
- dev.v2 - dev.v2
- switch-to-gha # XXX
jobs: jobs:
# Run the full Tilt build and wait for it to converge # Run the full Tilt build and wait for it to converge
tilt: tilt:
@ -17,7 +16,7 @@ jobs:
# (unfortunately, we can't differentiate between temporary and permanent # (unfortunately, we can't differentiate between temporary and permanent
# refs without duplicating the entire logic). # refs without duplicating the entire logic).
concurrency: concurrency:
group: tilt-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
steps: steps:
@ -51,7 +50,7 @@ jobs:
# The linter is slow enough that we want to run it on the self-hosted runner # The linter is slow enough that we want to run it on the self-hosted runner
runs-on: tilt-kube-public runs-on: tilt-kube-public
concurrency: concurrency:
group: tilt-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true cancel-in-progress: true
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2