Skip to content

Commit eb9bac6

Browse files
Michael Vasseurvmcj
authored andcommitted
Also run the status_checks in the merge queue
This also drops testing in the branches themselves as we don't allow pushing to those anymore. So those now run in the queue before so we keep CI green.
1 parent 5533e60 commit eb9bac6

13 files changed

+15
-60
lines changed

.github/workflows/autoconf-check-different-distro.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Check autoconf (Other distros)
22
on:
3-
push:
4-
branches:
5-
- main
6-
- '[0-9]+.[0-9]+'
3+
merge_group:
74
pull_request:
85
branches:
96
- main

.github/workflows/autoconf-check.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Check autoconf
22
on:
3-
push:
4-
branches:
5-
- main
6-
- '[0-9]+.[0-9]+'
3+
merge_group:
74
pull_request:
85
branches:
96
- main
@@ -16,7 +13,7 @@ jobs:
1613
version: [jammy, focal, rolling]
1714
os: [ubuntu]
1815
releaseBranch:
19-
- ${{ contains(github.ref, 'main') }}
16+
- ${{ contains(github.ref, 'gh-readonly-queue') }}
2017
exclude:
2118
- releaseBranch: false
2219
include:

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: "CodeQL"
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- '[0-9]+.[0-9]+'
4+
merge_group:
85
pull_request:
96
branches:
107
- main

.github/workflows/codespell.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
on:
2-
push:
3-
branches:
4-
- main
5-
- '[0-9]+.[0-9]+'
2+
merge_group:
63
pull_request:
74
branches:
85
- main

.github/workflows/codestyle.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Codestandard
22
on:
3-
push:
4-
branches:
5-
- main
6-
- '[0-9]+.[0-9]+'
3+
merge_group:
74
pull_request:
85
branches:
96
- main

.github/workflows/database-upgrade.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: Database Upgrade Test
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- '[0-9]+.[0-9]+'
4+
merge_group:
85
pull_request:
96
branches:
107
- main

.github/workflows/integration.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: Run integration tests
22
on:
3-
push:
4-
branches-ignore:
5-
- main
6-
- '[0-9]+.[0-9]+'
7-
- gh-readonly-queue/main/*
8-
- gh-readonly-queue/main/[0-9]+.[0-9]+
3+
merge_group:
94
pull_request:
105
branches:
116
- main

.github/workflows/phpcodesniffer.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ name: PHP CodeSniffer
22

33
# Controls when the action will run.
44
on:
5-
push:
6-
branches:
7-
- main
8-
- '[0-9]+.[0-9]+'
5+
merge_group:
96
pull_request:
107
branches:
118
- main

.github/workflows/phpstan.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Run PHPStan
22
on:
3-
push:
4-
branches:
5-
- main
6-
- '[0-9]+.[0-9]+'
3+
merge_group:
74
pull_request:
85
branches:
96
- main

.github/workflows/runpipe.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
name: Run runpipe and runguard tests
22
on:
3-
push:
4-
branches-ignore:
5-
- main
6-
- '[0-9]+.[0-9]+'
7-
- gh-readonly-queue/main/*
8-
- gh-readonly-queue/main/[0-9]+.[0-9]+
3+
merge_group:
94
pull_request:
105
branches:
116
- main

0 commit comments

Comments
 (0)