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

Fix unstable CI build #419

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Fix unstable CI build #419

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
f9069e4
CI: Fix unstable toolchain override setup.
kpreid Nov 13, 2023
5f7b109
CI: Replace `continue-on-error: true` with `fail-fast: false` for uns…
kpreid Nov 13, 2023
ba469c3
CI: give a suffix to `sed`
kpreid Nov 13, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ env:
jobs:
build:
strategy:
fail-fast: false
matrix:
# This matrix doesn't do any actual Cartesian products, but instead has a
# basic configuration (Linux, stable Rust, using lockfile) and also tries
Expand Down Expand Up @@ -74,7 +75,6 @@ jobs:
depversions: minimal
primary: false


runs-on: ${{ matrix.os }}-latest
continue-on-error: ${{ !matrix.primary }}

Expand All @@ -97,7 +97,7 @@ jobs:
# but we may want to override the toolchain.
if: ${{ matrix.toolchain != 'stable' }}
run: |
sed -i "s/stable/${{ matrix.toolchain }}/" rust-toolchain.toml
sed -i.origstable "s/stable/${{ matrix.toolchain }}/" rust-toolchain.toml
rustup show # triggers installation of selected toolchain

- name: Install nightly for -Z direct-minimal-versions
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/unstable-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ env:
jobs:
build:
strategy:
fail-fast: false
matrix:
include:
# Linux
Expand All @@ -56,18 +57,18 @@ jobs:
depversions: locked

runs-on: ${{ matrix.os }}-latest
continue-on-error: true

steps:
- uses: actions/[email protected]
with:
ref: unstable-rust

- name: Set Rust toolchain
# The rust-toolchain.toml file specifies the targets and components we need.
# Therefore, CI only needs to set the toolchain override.
# The rust-toolchain.toml file specifies the targets and components we need,
# but we may want to override the toolchain.
if: ${{ matrix.toolchain != 'stable' }}
run: |
rustup override set "${{ matrix.toolchain }}"
sed -i.origstable "s/stable/${{ matrix.toolchain }}/" rust-toolchain.toml
rustup show # triggers installation of selected toolchain

- name: Install native libraries
Expand Down
Loading