Skip to content

Commit

Permalink
CI: Combine MSRV-check with -Zminimal-versions build
Browse files Browse the repository at this point in the history
Sometimes dependency crates bump their MSRV beyond our MSRV in a patch
release, and fail our CI in subsequent versions.  Instead of downgrading
independent crates in CI every time this issue arises, combine it with
our already-existing `-Zminimal-versions` check.  Instead of running
this check on `nightly`, we only use that toolchain to generate a
`Cargo.lock` and subsequently `check` the code on our MSRV toolchain.
  • Loading branch information
MarijnS95 committed Nov 5, 2024
1 parent b65efbc commit 5db3c4f
Showing 1 changed file with 9 additions and 42 deletions.
51 changes: 9 additions & 42 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,24 @@ jobs:
sudo apt-get install -y libdrm-dev
- name: Fetch drm headers
run: ./.github/workflows/fetch_headers.sh
- name: Update deps
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
profile: minimal
default: true
override: true
- name: Generate minimal-versions lockfile
uses: actions-rs/cargo@v1
with:
command: update
command: generate-lockfile
args: -Z minimal-versions
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.66.0
profile: minimal
components: clippy
default: true
override: true
- name: Downgrade home
run: cargo update -p home --precise 0.5.5
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -100,43 +105,6 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all --all-features --all-targets -- -D warnings -A clippy::redundant_static_lifetimes

check-minimal:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- run: |
sudo apt-get update -y
sudo apt-get install -y libdrm-dev
- name: Fetch drm headers
run: ./.github/workflows/fetch_headers.sh
- name: Update deps
uses: actions-rs/cargo@v1
with:
command: update
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
profile: minimal
default: true
override: true
- name: Cargo cache
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: ${{ runner.os }}-cargo-rust_nightly-${{ hashFiles('**/Cargo.toml') }}
- name: Build cache
uses: actions/cache@v3
with:
path: target
key: ${{ runner.os }}-build-rust_nightly-check-minimal-${{ hashFiles('**/Cargo.toml') }}
- name: Check
uses: actions-rs/cargo@v1
with:
command: check
args: --all --all-features --all-targets -Z minimal-versions

test:
needs:
- format
Expand Down Expand Up @@ -310,7 +278,6 @@ jobs:
- format
- doc
- check
- check-minimal
- test
runs-on: ubuntu-22.04
steps:
Expand Down

0 comments on commit 5db3c4f

Please sign in to comment.