Skip to content

Commit

Permalink
Also run the status_checks in the merge queue
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Michael Vasseur authored and vmcj committed Nov 22, 2024
1 parent 5533e60 commit eb9bac6
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 60 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/autoconf-check-different-distro.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Check autoconf (Other distros)
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/autoconf-check.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Check autoconf
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand All @@ -16,7 +13,7 @@ jobs:
version: [jammy, focal, rolling]
os: [ubuntu]
releaseBranch:
- ${{ contains(github.ref, 'main') }}
- ${{ contains(github.ref, 'gh-readonly-queue') }}
exclude:
- releaseBranch: false
include:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: "CodeQL"

on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/codestyle.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Codestandard
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/database-upgrade.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
name: Database Upgrade Test

on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Run integration tests
on:
push:
branches-ignore:
- main
- '[0-9]+.[0-9]+'
- gh-readonly-queue/main/*
- gh-readonly-queue/main/[0-9]+.[0-9]+
merge_group:
pull_request:
branches:
- main
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/phpcodesniffer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ name: PHP CodeSniffer

# Controls when the action will run.
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Run PHPStan
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/runpipe.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Run runpipe and runguard tests
on:
push:
branches-ignore:
- main
- '[0-9]+.[0-9]+'
- gh-readonly-queue/main/*
- gh-readonly-queue/main/[0-9]+.[0-9]+
merge_group:
pull_request:
branches:
- main
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/shiftleft.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: SL Scan

on:
push:
branches-ignore:
- main
- '[0-9]+.[0-9]+'
- gh-readonly-queue/main/*
- gh-readonly-queue/main/[0-9]+.[0-9]+
merge_group:

jobs:
Scan-Build:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Unit tests
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/webstandard.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Webstandard (WCAG, W3C)
on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
merge_group:
pull_request:
branches:
- main
Expand All @@ -30,7 +27,7 @@ jobs:
test: [w3cval, WCAG2A, WCAG2AA]
db: [bare-install, install]
releaseBranch:
- ${{ contains(github.ref, 'main') }}
- ${{ contains(github.ref, 'gh-readonly-queue') }}
exclude:
- releaseBranch: false
- role: jury
Expand Down

0 comments on commit eb9bac6

Please sign in to comment.