Skip to content

Commit 6c9421f

Browse files
authored
Merge pull request #42134 from badeggg/fix-41936
[No QA] do not skip workflow on main branch
2 parents 077297e + 54a22fa commit 6c9421f

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

.github/workflows/e2ePerformanceTests.yml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ on:
1515
type: string
1616
required: true
1717

18+
concurrency:
19+
group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-e2e
20+
cancel-in-progress: true
21+
1822
jobs:
1923
buildBaseline:
2024
runs-on: ubuntu-latest-xl

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
99

1010
concurrency:
11-
group: "${{ github.ref }}-lint"
11+
group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
1212
cancel-in-progress: true
1313

1414
jobs:

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
99

1010
concurrency:
11-
group: "${{ github.ref }}-jest"
11+
group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-jest
1212
cancel-in-progress: true
1313

1414
jobs:

.github/workflows/typecheck.yml

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
branches-ignore: [staging, production]
88
paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', 'tsconfig.json']
99

10+
concurrency:
11+
group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-typecheck
12+
cancel-in-progress: true
13+
1014
jobs:
1115
typecheck:
1216
if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}

0 commit comments

Comments
 (0)