Skip to content

Commit 1f24ab1

Browse files
authored
Fix MSRV build failures during CI (#179)
## 🎟️ Tracking <!-- Paste the link to the Jira or GitHub issue or otherwise describe / point to where this change is coming from. --> ## 📔 Objective I've removed the MSRV from the clippy workflow. It wasn't working correctly as the toolchain file was overriding the manually provided rust version, and with the newest rustup it was erroring as the toolchain wasn't installed (and the latest rustup won't do it automatically like before). MSRV is still being checked by the `minimum-rust-version.yml` workflow, which I've also updated to use an explicit rust version in case the toolchain was also overriding it. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes
1 parent 2e53543 commit 1f24ab1

File tree

2 files changed

+2
-23
lines changed

2 files changed

+2
-23
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ jobs:
1515

1616
runs-on: ubuntu-24.04
1717

18-
strategy:
19-
fail-fast: false
20-
matrix:
21-
channel:
22-
- "rust-toolchain" # The version defined in rust-toolchain
23-
- "msrv" # The supported MSRV
24-
2518
steps:
2619
- name: Checkout
2720
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -30,13 +23,7 @@ jobs:
3023
id: toolchain
3124
shell: bash
3225
run: |
33-
if [[ "${{ matrix.channel }}" == 'rust-toolchain' ]]; then
34-
RUST_TOOLCHAIN="$(grep -oP '^channel.*"(\K.*?)(?=")' rust-toolchain.toml)"
35-
elif [[ "${{ matrix.channel }}" == 'msrv' ]]; then
36-
RUST_TOOLCHAIN="$(grep -oP '^rust-version.*"(\K.*?)(?=")' Cargo.toml)"
37-
else
38-
RUST_TOOLCHAIN="${{ matrix.channel }}"
39-
fi
26+
RUST_TOOLCHAIN="$(grep -oP '^channel.*"(\K.*?)(?=")' rust-toolchain.toml)"
4027
echo "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
4128
4229
- name: Set Rust Nightly Toolchain
@@ -48,7 +35,6 @@ jobs:
4835
4936
- name: Install rust
5037
uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203 # stable
51-
if: ${{ matrix.channel == 'rust-toolchain' }}
5238
with:
5339
toolchain: "${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}"
5440
components: clippy, rustfmt

.github/workflows/minimum-rust-version.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ jobs:
3535
RUST_TOOLCHAIN="$(grep -oP '^rust-version.*"(\K.*?)(?=")' Cargo.toml)"
3636
echo "RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
3737
38-
- name: Set Rust Nightly Toolchain
39-
id: nightly-toolchain
40-
shell: bash
41-
run: |
42-
RUST_NIGHTLY_TOOLCHAIN="$(grep -oP '^nightly-channel.*"(\K.*?)(?=")' rust-toolchain.toml)"
43-
echo "RUST_NIGHTLY_TOOLCHAIN=${RUST_NIGHTLY_TOOLCHAIN}" | tee -a "${GITHUB_OUTPUT}"
44-
4538
- name: Install rust
4639
uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203 # stable
4740
with:
@@ -54,4 +47,4 @@ jobs:
5447
key: msrv-${{ matrix.settings.target }}-cargo-${{ matrix.settings.os }}
5548

5649
- name: Cargo check MSRV
57-
run: cargo check --all-features
50+
run: cargo +"${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}" check --all-features

0 commit comments

Comments
 (0)