feat(ci): configure merge_queue to be a PR-like event

rust-lang · Jan 5, 2024 · ee558ad · ee558ad
1 parent 07e28ac
commit ee558ad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
   # Do not edit this file in .github/workflows
   build-windows-pr: # job-name skip-master skip-stable
     runs-on: windows-latest
-    if: ${{ github.event.pull_request }} # skip-master skip-stable
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }} # skip-master skip-stable
     env:
       RUSTFLAGS: -Ctarget-feature=+crt-static
     strategy:
@@ -433,7 +433,7 @@ jobs:
   # Do not edit this file in .github/workflows
   build-linux-pr: # job-name skip-master skip-stable
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }} # skip-master skip-stable
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }} # skip-master skip-stable
     strategy:
       fail-fast: false
       matrix:
@@ -1143,7 +1143,7 @@ jobs:
   # templating and so on.
   build-all-features: # job-name
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }}
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }}
     strategy:
       fail-fast: false
       matrix:
@@ -1182,7 +1182,7 @@ jobs:
   # stable is placed in the root of the gh-pages branch, while master is placed at /devel
   doc: # job-name
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }}
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }}
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/ci/actions-templates/all-features-template.yaml b/ci/actions-templates/all-features-template.yaml
@@ -9,7 +9,7 @@ jobs: # skip-all
   # templating and so on.
   build-all-features: # job-name
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }}
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }}
     strategy:
       fail-fast: false
       matrix:

diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml
@@ -6,7 +6,7 @@ jobs: # skip-master skip-pr skip-stable
   build-linux-master: # job-name skip-pr skip-stable
   build-linux-stable: # job-name skip-master skip-pr
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }} # skip-master skip-stable
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }} # skip-master skip-stable
     if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
     if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-pr skip-master
     strategy:

diff --git a/ci/actions-templates/test-docs-template.yaml b/ci/actions-templates/test-docs-template.yaml
@@ -7,7 +7,7 @@ jobs: # skip-all
   # stable is placed in the root of the gh-pages branch, while master is placed at /devel
   doc: # job-name
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request }}
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }}
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
@@ -6,7 +6,7 @@ jobs: # skip-master skip-pr skip-stable
   build-windows-master: # job-name skip-pr skip-stable
   build-windows-stable: # job-name skip-master skip-pr
     runs-on: windows-latest
-    if: ${{ github.event.pull_request }} # skip-master skip-stable
+    if: ${{ contains("['pull_request', 'merge_group']", github.event_name) }} # skip-master skip-stable
     if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
     if: ${{ github.event_name == 'push' && github.ref_name == 'stable' }} # skip-pr skip-master
     env: