From 31b02e466e2a775bda0f5990e4455cb9cbd49863 Mon Sep 17 00:00:00 2001 From: Adam Moussa <166072409+amoussa1229@users.noreply.github.com> Date: Fri, 5 Jun 2026 12:30:58 -0400 Subject: [PATCH] fix(ci): disambiguate concurrency groups across sibling reusable-CI callers (#41) The group key ci-${{ github.workflow }}-${{ github.ref }} resolves identically for every job in a caller workflow (github.workflow is the caller's name in a reusable workflow), so repos calling two reusable CI workflows from one ci.yaml (e.g. exec-aide python + typescript) had their jobs cancel each other on every run. Prefix each group with the reusable workflow's own filename and append its distinguishing input (source-dirs / working-directory) so sibling jobs get distinct groups while superseded runs of the same job still cancel. --- .github/workflows/ci-dotnet.yaml | 2 +- .github/workflows/ci-python-sam.yaml | 2 +- .github/workflows/ci-typescript-cdk.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-dotnet.yaml b/.github/workflows/ci-dotnet.yaml index 8d735bd..21071d6 100644 --- a/.github/workflows/ci-dotnet.yaml +++ b/.github/workflows/ci-dotnet.yaml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} + group: ci-dotnet-${{ github.workflow }}-${{ github.ref }}-${{ inputs.working-directory }} cancel-in-progress: true defaults: run: diff --git a/.github/workflows/ci-python-sam.yaml b/.github/workflows/ci-python-sam.yaml index dd1f5d9..2e0c019 100644 --- a/.github/workflows/ci-python-sam.yaml +++ b/.github/workflows/ci-python-sam.yaml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} + group: ci-python-sam-${{ github.workflow }}-${{ github.ref }}-${{ inputs.source-dirs }} cancel-in-progress: true steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/ci-typescript-cdk.yaml b/.github/workflows/ci-typescript-cdk.yaml index f3ac699..adc2dc7 100644 --- a/.github/workflows/ci-typescript-cdk.yaml +++ b/.github/workflows/ci-typescript-cdk.yaml @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 concurrency: - group: ci-${{ github.workflow }}-${{ github.ref }} + group: ci-typescript-cdk-${{ github.workflow }}-${{ github.ref }}-${{ inputs.working-directory }} cancel-in-progress: true steps: - uses: actions/checkout@v6