From cf3f6def682d5c533a5e952f7c813f42b66515f4 Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 7 Feb 2022 23:28:54 +0100 Subject: [PATCH] .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 --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc9820e64..3296b4b5e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: push: branches: - dev.v2 - - switch-to-gha # XXX jobs: # Run the full Tilt build and wait for it to converge tilt: @@ -17,7 +16,7 @@ jobs: # (unfortunately, we can't differentiate between temporary and permanent # refs without duplicating the entire logic). concurrency: - group: tilt-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true steps: @@ -51,7 +50,7 @@ jobs: # The linter is slow enough that we want to run it on the self-hosted runner runs-on: tilt-kube-public concurrency: - group: tilt-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true steps: - uses: actions/checkout@v2