Skip to content

Commit

Permalink
chore(ci): enable merge queues
Browse files Browse the repository at this point in the history
  • Loading branch information
pweyck committed Jan 23, 2025
1 parent 6c1bc65 commit 5adc681
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/downstream.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Downstream

on:
merge_group:
workflow_dispatch:
inputs:
nightly:
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Integration tests

on:
pull_request:
merge_group:
workflow_dispatch:
inputs:
nightly:
Expand All @@ -15,6 +16,7 @@ on:
jobs:
acceptance:
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -134,6 +136,7 @@ jobs:

phpunit-matrix:
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' }}
outputs:
matrix: ${{ steps.generate-matrix.outputs.matrix }}
steps:
Expand All @@ -149,6 +152,7 @@ jobs:
phpunit:
name: "${{ matrix.php}} ${{ matrix.test.testsuite }}${{ matrix.test.path }} ${{ matrix.db }}"
if: ${{ github.event_name != 'pull_request' }}
needs:
- phpunit-matrix
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -204,6 +208,7 @@ jobs:

win-checkout:
runs-on: windows-latest
if: ${{ github.event_name != 'pull_request' }}
name: "Windows check"

steps:
Expand Down Expand Up @@ -311,6 +316,7 @@ jobs:
tested-update-versions:
name: tested-versions
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' }}
outputs:
first-version: ${{ steps.versions.outputs.first-version }}
latest-version: ${{ steps.versions.outputs.latest-version }}
Expand All @@ -324,6 +330,7 @@ jobs:
acceptance-update:
needs: tested-update-versions
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -427,6 +434,7 @@ jobs:
blue-green-66-67:
name: "PHP blue green 6.6 -> 6.7 -> 6.6"
runs-on: ubuntu-24.04
if: ${{ github.event_name != 'pull_request' }}
env:
APP_ENV: test
APP_URL: http://localhost:8000
Expand Down Expand Up @@ -497,5 +505,6 @@ jobs:
uses: re-actors/alls-green@release/v1
with:
# allowed-failures: docs, linters
# allowed-skips: non-voting-flaky-job
# allow all jobs to be skipped in case of a PR run
allowed-skips: acceptance, phpunit, win-checkout, code-ql, acceptance-update, blue-green-66-67
jobs: ${{ toJSON(needs) }}
Empty file added test
Empty file.

0 comments on commit 5adc681

Please sign in to comment.