Skip to content

Commit a0aa633

Browse files
authored
Remove concurrency to fix merge queue (#4996)
1 parent 9342afd commit a0aa633

8 files changed

+0
-112
lines changed

.github/workflows/check-cabal-files.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
check-cabal-files:
239
runs-on: ubuntu-latest

.github/workflows/check-git-dependencies.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
build:
239
runs-on: ubuntu-latest

.github/workflows/check-hlint.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
build:
239
runs-on: ubuntu-latest

.github/workflows/check-mainnet-config.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
build:
239
runs-on: ubuntu-latest

.github/workflows/check-nix-config.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
build:
239
runs-on: ubuntu-latest

.github/workflows/haskell-linux.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
linux_ci:
239
runs-on: ${{ matrix.os }}

.github/workflows/haskell.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
build:
239
runs-on: ${{ matrix.os }}

.github/workflows/markdown-links-ci-check.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@ on:
44
push:
55
merge_group:
66

7-
# When pushing branches (and/or updating PRs), we do want to cancel previous
8-
# build runs. We assume they are stale now; and do not want to spend CI time and
9-
# resources on continuing to continue those runs. This is what the concurrency.group
10-
# value lets us express. When using merge queues, we now have to consider
11-
# - runs triggers by commits per pull-request
12-
# we want to cancel any previous run. So they should all get the same group (per PR)
13-
# - runs refs/heads/gh-readonly-queue/<target branch name> (they should all get their
14-
# unique git ref, we don't want to cancel any of the ones in the queue)
15-
# - if it's neither, we fall back to the run_id (this is a unique number for each
16-
# workflow run; it does not change if you "rerun" a job)
17-
concurrency:
18-
group: ${{ github.workflow }}-${{ github.event.type }}-${{ startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && github.ref || github.event.pull_request.number || github.run_id }}
19-
cancel-in-progress: true
20-
217
jobs:
228
markdown-link-check:
239
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)