Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ci): enable the merge_group trigger #3633

Merged
merged 3 commits into from
Jan 5, 2024
Merged

feat(ci): enable the merge_group trigger #3633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b806d7f
fix(ci): use `github.event_name == 'schedule'` instead of `github.eve…
rami3l Jan 5, 2024
07e28ac
feat(ci): enable the `merge_group` trigger
rami3l Jan 5, 2024
2b5fc20
feat(ci): configure `merge_queue` to be a PR-like event
rami3l Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
name: CI

on:
merge_group:
pull_request:
branches:
- "*"
Expand All @@ -21,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:
Expand Down Expand Up @@ -153,7 +154,7 @@ jobs:
# Do not edit this file in .github/workflows
build-windows-master: # job-name skip-pr skip-stable
runs-on: windows-latest
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event.schedule }} # skip-pr skip-stable
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
env:
RUSTFLAGS: -Ctarget-feature=+crt-static
strategy:
Expand Down Expand Up @@ -432,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:
Expand Down Expand Up @@ -576,7 +577,7 @@ jobs:
# Do not edit this file in .github/workflows
build-linux-master: # job-name skip-pr skip-stable
runs-on: ubuntu-latest
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event.schedule }} # skip-pr skip-stable
if: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event_name == 'schedule' }} # skip-pr skip-stable
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -1142,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:
Expand Down Expand Up @@ -1181,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:
Expand Down
2 changes: 1 addition & 1 deletion ci/actions-templates/all-features-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions ci/actions-templates/gen-workflows.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ cat << EOF > "$OUTPATH"
name: CI

on:
merge_group:
pull_request:
branches:
- "*"
Expand Down
4 changes: 2 additions & 2 deletions ci/actions-templates/linux-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event.schedule }} # skip-pr 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:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion ci/actions-templates/test-docs-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions ci/actions-templates/windows-builds-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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: ${{ (github.event_name == 'push' && github.ref_name == 'master') || github.event.schedule }} # skip-pr 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:
RUSTFLAGS: -Ctarget-feature=+crt-static
Expand Down
Loading