Skip to content

Commit 317cf9a

Browse files
committed
CI: update concurrency once again
The test for the 'main' branch was not correct
1 parent 8c699a1 commit 317cf9a

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/config_options.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212

1313
concurrency:
1414
# Group by workflow and ref; the last component ensures that for pull requests
15-
# we limit to one concurrent job, but for the default/stable branch we don't
16-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
15+
# we limit to one concurrent job, but for the main/stable branches we don't
16+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
1717
# Only cancel intermediate pull request builds
1818
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1919

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212

1313
concurrency:
1414
# Group by workflow and ref; the last component ensures that for pull requests
15-
# we limit to one concurrent job, but for the default/stable branch we don't
16-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
15+
# we limit to one concurrent job, but for the main/stable branches we don't
16+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
1717
# Only cancel intermediate pull request builds
1818
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1919

.github/workflows/manual.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ on:
1212

1313
concurrency:
1414
# Group by workflow and ref; the last component ensures that for pull requests
15-
# we limit to one concurrent job, but for the default/stable branch we don't
16-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
15+
# we limit to one concurrent job, but for the main/stable branches we don't
16+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
1717
# Only cancel intermediate pull request builds
1818
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
1919

.github/workflows/os.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ env:
1515

1616
concurrency:
1717
# Group by workflow and ref; the last component ensures that for pull requests
18-
# we limit to one concurrent job, but for the default/stable branch we don't
19-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
18+
# we limit to one concurrent job, but for the main/stable branches we don't
19+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
2020
# Only cancel intermediate pull request builds
2121
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2222

.github/workflows/ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ env:
1515

1616
concurrency:
1717
# Group by workflow and ref; the last component ensures that for pull requests
18-
# we limit to one concurrent job, but for the default/stable branch we don't
19-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
18+
# we limit to one concurrent job, but for the main/stable branches we don't
19+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
2020
# Only cancel intermediate pull request builds
2121
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2222

.github/workflows/valgrind.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ env:
1616

1717
concurrency:
1818
# Group by workflow and ref; the last component ensures that for pull requests
19-
# we limit to one concurrent job, but for the default/stable branch we don't
20-
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != github.event.repository.default_branch && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
19+
# we limit to one concurrent job, but for the main/stable branches we don't
20+
group: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/heads/stable-')) || github.run_number }}
2121
# Only cancel intermediate pull request builds
2222
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
2323

0 commit comments

Comments
 (0)