Skip to content

Commit

Permalink
consistently use concurrency-name (including correcting errors) (#18335)
Browse files Browse the repository at this point in the history
  • Loading branch information
altendky authored Jul 18, 2024
1 parent 8fcfd20 commit a9ad2ac
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reflow-publish-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

concurrency:
# SHA is added to the end if on `main` to let all main workflows run
group: ${{ github.ref }}-${{ github.workflow }}-${{ inputs.concurrency_name }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
group: ${{ github.ref }}-${{ github.workflow }}-${{ inputs.concurrency-name }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
cancel-in-progress: true

permissions:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
file_name:
required: true
type: string
concurrency_name:
concurrency-name:
required: true
type: string
configuration:
Expand All @@ -42,7 +42,7 @@ on:

concurrency:
# SHA is added to the end if on `main` to let all main workflows run
group: ${{ github.ref }}-${{ github.workflow }}-${{ inputs.concurrency_name }}-${{ github.event_name == 'workflow_dispatch' && github.run_id || '' }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
group: ${{ github.ref }}-${{ github.workflow }}-${{ inputs.concurrency-name }}-${{ github.event_name == 'workflow_dispatch' && github.run_id || '' }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
cancel-in-progress: true

defaults:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
matrix: macos-intel
name: macOS Intel
file_name: macos
concurrency_name: macos-intel
concurrency-name: macos-intel
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: macos-12
Expand All @@ -131,7 +131,7 @@ jobs:
matrix: macos
name: macOS ARM
file_name: macos-arm
concurrency_name: macos-arm
concurrency-name: macos-arm
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: macos-14
Expand All @@ -146,7 +146,7 @@ jobs:
matrix: ubuntu
name: Ubuntu
file_name: ubuntu
concurrency_name: ubuntu
concurrency-name: ubuntu
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: ubuntu-latest
Expand All @@ -161,7 +161,7 @@ jobs:
matrix: windows
name: Windows
file_name: windows
concurrency_name: windows
concurrency-name: windows
configuration: ${{ needs.configure.outputs.configuration }}
matrix_mode: ${{ needs.configure.outputs.matrix_mode }}
runs-on: windows-latest
Expand Down

0 comments on commit a9ad2ac

Please sign in to comment.