From eb9bac617d1c8e399d14271932f146415b925486 Mon Sep 17 00:00:00 2001 From: Michael Vasseur Date: Fri, 22 Nov 2024 12:03:50 +0100 Subject: [PATCH] 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. --- .github/workflows/autoconf-check-different-distro.yml | 5 +---- .github/workflows/autoconf-check.yml | 7 ++----- .github/workflows/codeql-analysis.yml | 5 +---- .github/workflows/codespell.yml | 5 +---- .github/workflows/codestyle.yml | 5 +---- .github/workflows/database-upgrade.yml | 5 +---- .github/workflows/integration.yml | 7 +------ .github/workflows/phpcodesniffer.yml | 5 +---- .github/workflows/phpstan.yml | 5 +---- .github/workflows/runpipe.yml | 7 +------ .github/workflows/shiftleft.yml | 7 +------ .github/workflows/unit-tests.yml | 5 +---- .github/workflows/webstandard.yml | 7 ++----- 13 files changed, 15 insertions(+), 60 deletions(-) diff --git a/.github/workflows/autoconf-check-different-distro.yml b/.github/workflows/autoconf-check-different-distro.yml index 8216eb3a26..76597171e4 100644 --- a/.github/workflows/autoconf-check-different-distro.yml +++ b/.github/workflows/autoconf-check-different-distro.yml @@ -1,9 +1,6 @@ name: Check autoconf (Other distros) on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/autoconf-check.yml b/.github/workflows/autoconf-check.yml index 016ec024f7..dee59a67c6 100644 --- a/.github/workflows/autoconf-check.yml +++ b/.github/workflows/autoconf-check.yml @@ -1,9 +1,6 @@ name: Check autoconf on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main @@ -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: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 645826c186..daf1529789 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,10 +1,7 @@ name: "CodeQL" on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 6ac2a9f5c8..4e88d00c28 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -1,8 +1,5 @@ on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml index 978bd4bb3d..d694cef6e7 100644 --- a/.github/workflows/codestyle.yml +++ b/.github/workflows/codestyle.yml @@ -1,9 +1,6 @@ name: Codestandard on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/database-upgrade.yml b/.github/workflows/database-upgrade.yml index 1b181f4406..dd3fe7a351 100644 --- a/.github/workflows/database-upgrade.yml +++ b/.github/workflows/database-upgrade.yml @@ -1,10 +1,7 @@ name: Database Upgrade Test on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c1a2c61e16..0102da18f4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -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 diff --git a/.github/workflows/phpcodesniffer.yml b/.github/workflows/phpcodesniffer.yml index e733a25c3f..249b86ce63 100644 --- a/.github/workflows/phpcodesniffer.yml +++ b/.github/workflows/phpcodesniffer.yml @@ -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 diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index d43788bb2a..3a2e5ac66c 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -1,9 +1,6 @@ name: Run PHPStan on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/runpipe.yml b/.github/workflows/runpipe.yml index 804e721cfa..d4f97e4555 100644 --- a/.github/workflows/runpipe.yml +++ b/.github/workflows/runpipe.yml @@ -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 diff --git a/.github/workflows/shiftleft.yml b/.github/workflows/shiftleft.yml index af212548e8..3f89782341 100644 --- a/.github/workflows/shiftleft.yml +++ b/.github/workflows/shiftleft.yml @@ -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: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b6b6afd1a4..b26abc8118 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -1,9 +1,6 @@ name: Unit tests on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main diff --git a/.github/workflows/webstandard.yml b/.github/workflows/webstandard.yml index ac9bc25756..23e0760cab 100644 --- a/.github/workflows/webstandard.yml +++ b/.github/workflows/webstandard.yml @@ -1,9 +1,6 @@ name: Webstandard (WCAG, W3C) on: - push: - branches: - - main - - '[0-9]+.[0-9]+' + merge_group: pull_request: branches: - main @@ -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