Skip to content

Commit cd9dd05

Browse files
committed
better solution for MSRV check
1 parent 3564036 commit cd9dd05

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
include:
60-
# TODO: There are currently no working Atmel tests...
61-
# - { rust: stable, vendor: Atmel }
62-
# - { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
60+
- { rust: stable, vendor: Atmel }
61+
- { rust: stable, vendor: Atmel, options: "-- --strict --atomics" }
6362
- { rust: stable, vendor: Freescale }
6463
- { rust: stable, vendor: Freescale, options: "-- --strict --atomics" }
6564
- { rust: stable, vendor: Fujitsu }
@@ -96,9 +95,8 @@ jobs:
9695
steps:
9796
- uses: actions/checkout@v4
9897

99-
- uses: dtolnay/rust-toolchain@master
100-
with:
101-
toolchain: ${{ matrix.rust }}
98+
- uses: dtolnay/rust-toolchain@stable
99+
- uses: dtolnay/[email protected]
102100

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

111+
- name: Run reression tool with MSRV
112+
run: cargo regress tests --toolchain 1.76.0 -m Nordic -- --strict --atomics
113+
113114
ci-clippy:
114115
runs-on: ubuntu-latest
115116
needs: [check]

ci/svd2rust-regress/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ edition = "2021"
33
name = "svd2rust-regress"
44
version = "0.1.0"
55
authors = ["James Munns <[email protected]>", "The svd2rust developers"]
6+
rust-version = "1.82.0"
67

78
[dependencies]
89
clap = { version = "4.1", features = ["color", "derive", "string", "env"] }

ci/svd2rust-regress/src/github.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ fn find_executable(dir: &Path, begins: &str) -> Result<Option<PathBuf>, anyhow::
9393
.path()
9494
.extension()
9595
.is_some_and(|s| s == std::env::consts::EXE_EXTENSION))
96-
&& entry.path().extension().map_or(true, |s| s != "gz")
96+
&& entry.path().extension().is_none_or(|s| s != "gz")
9797
{
9898
Ok(Some(entry.path()))
9999
} else {

0 commit comments

Comments
 (0)