Skip to content

Commit

Permalink
better solution for MSRV check
Browse files Browse the repository at this point in the history
  • Loading branch information
robamu committed Feb 4, 2025
1 parent 3564036 commit cd9dd05
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ jobs:
fail-fast: false
matrix:
include:
# TODO: There are currently no working Atmel tests...
# - { rust: stable, vendor: Atmel }
# - { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
- { rust: stable, vendor: Atmel }
- { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
- { rust: stable, vendor: Freescale }
- { rust: stable, vendor: Freescale, options: "-- --strict --atomics" }
- { rust: stable, vendor: Fujitsu }
Expand Down Expand Up @@ -96,9 +95,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- uses: dtolnay/rust-toolchain@stable
- uses: dtolnay/[email protected]

- name: Cache
uses: Swatinem/rust-cache@v2
Expand All @@ -110,6 +108,9 @@ jobs:
- name: Run regression tool
run: cargo regress tests -m ${{ matrix.vendor }} ${{ matrix.options }}

- name: Run reression tool with MSRV
run: cargo regress tests --toolchain 1.76.0 -m Nordic -- --strict --atomics

ci-clippy:
runs-on: ubuntu-latest
needs: [check]
Expand Down
1 change: 1 addition & 0 deletions ci/svd2rust-regress/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ edition = "2021"
name = "svd2rust-regress"
version = "0.1.0"
authors = ["James Munns <[email protected]>", "The svd2rust developers"]
rust-version = "1.82.0"

[dependencies]
clap = { version = "4.1", features = ["color", "derive", "string", "env"] }
Expand Down
2 changes: 1 addition & 1 deletion ci/svd2rust-regress/src/github.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ fn find_executable(dir: &Path, begins: &str) -> Result<Option<PathBuf>, anyhow::
.path()
.extension()
.is_some_and(|s| s == std::env::consts::EXE_EXTENSION))
&& entry.path().extension().map_or(true, |s| s != "gz")
&& entry.path().extension().is_none_or(|s| s != "gz")
{
Ok(Some(entry.path()))
} else {
Expand Down

0 comments on commit cd9dd05

Please sign in to comment.