-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into jordens-patch-1
- Loading branch information
Showing
1 changed file
with
8 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,17 +49,20 @@ jobs: | |
compile: | ||
runs-on: ubuntu-latest | ||
continue-on-error: ${{ matrix.toolchain == 'nightly' }} | ||
continue-on-error: ${{ matrix.continue-on-error }} | ||
strategy: | ||
matrix: | ||
# keep MSRV in sync in ci.yaml and Cargo.toml | ||
toolchain: [stable, '1.65.0'] | ||
features: [''] | ||
continue-on-error: [false] | ||
include: | ||
- toolchain: beta | ||
features: '' | ||
continue-on-error: true | ||
- toolchain: nightly | ||
features: nightly | ||
continue-on-error: true | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions-rs/toolchain@v1 | ||
|
@@ -126,8 +129,11 @@ jobs: | |
hitl-trigger: | ||
runs-on: ubuntu-latest | ||
environment: hitl | ||
# This crucially marks the job as "skipped" when not in the merge queue thus | ||
# counting as passing the required check when adding it to the merge queue. | ||
# See | ||
# https://docs.github.com/en/actions/using-jobs/using-conditions-to-control-job-execution#overview | ||
if: ${{ github.event_name == 'merge_group' }} | ||
|
||
steps: | ||
- uses: LouisBrunner/[email protected] | ||
id: hitl-check | ||
|