From ee558ad91726f629a6ae105506851d7992c4e85b Mon Sep 17 00:00:00 2001 From: rami3l Date: Fri, 5 Jan 2024 13:08:39 +0800 Subject: [PATCH] feat(ci): configure `merge_queue` to be a PR-like event --- .github/workflows/ci.yaml | 8 ++++---- ci/actions-templates/all-features-template.yaml | 2 +- ci/actions-templates/linux-builds-template.yaml | 2 +- ci/actions-templates/test-docs-template.yaml | 2 +- ci/actions-templates/windows-builds-template.yaml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e4f3b96d05a..838c84dc114 100644 --- 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 index 7e7bab0c212..db6b392f96f 100644 --- 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 index 3327122cf96..ea044c82d49 100644 --- 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 index c17cd521935..77a2905055f 100644 --- 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 index 7f6ff3a254b..78ca869c423 100644 --- 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: