Toolchain tweak

card-io-ecg · Sep 5, 2024 · a205cef · a205cef
1 parent 45cdea5
commit a205cef
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,12 @@ jobs:
         with:
           default: true
           buildtargets: esp32s3
+          version: "1.80.0"
           ldproxy: false
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-06-01
+          components: clippy, rustfmt, rust-src
       - uses: Swatinem/rust-cache@v2
 
       - uses: cargo-bins/cargo-binstall@main

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -28,7 +28,12 @@ jobs:
         with:
           default: true
           buildtargets: esp32s3
+          version: "1.80.0"
           ldproxy: false
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-06-01
+          components: clippy, rustfmt, rust-src
       - uses: Swatinem/rust-cache@v2
 
       - name: format check

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -21,7 +21,12 @@ jobs:
         with:
           default: true
           buildtargets: esp32s3
+          version: "1.80.0"
           ldproxy: false
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2024-06-01
+          components: clippy, rustfmt, rust-src
       - uses: Swatinem/rust-cache@v2
 
       - uses: cargo-bins/cargo-binstall@main

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -376,7 +376,7 @@ impl SocConfig {
     fn toolchain(self) -> &'static str {
         match self {
             SocConfig::S3 => "esp",
-            SocConfig::C6 => "nightly-2024-06-01-x86_64-pc-windows-msvc",
+            SocConfig::C6 => "nightly-2024-06-01",
         }
     }
 }