Use newer version of Rust toolchain setup

This also enables caching by default
axolotl-chat · Aug 6, 2024 · 68958bf · 68958bf
1 parent ce608f0
commit 68958bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,12 +46,10 @@ jobs:
         run: sudo apt-get install protobuf-compiler
 
       - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
+          rustflags: ''
 
       - name: Check out code
         uses: actions/checkout@v4
@@ -137,10 +135,11 @@ jobs:
           sudo apt-get update && sudo apt-get install -y --no-install-recommends libgtk-3-dev:arm64 libwebkit2gtk-4.1-dev:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64 libssl-dev:arm64 libjavascriptcoregtk-4.1-dev:arm64
 
       - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
-          targets: aarch64-unknown-linux-gnu
+          target: aarch64-unknown-linux-gnu
+          rustflags: ''
 
       - name: Setup C compiler, linker and pkgconfig
         run: |
@@ -154,9 +153,6 @@ jobs:
           echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV
           echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV
 
-      - name: Rust cache
-        uses: swatinem/rust-cache@v2
-
       - name: Check out code
         uses: actions/checkout@v4
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,10 +34,11 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
           components: rustfmt
+          rustflags: ''
 
       - name: Check code format
         uses: actions-rust-lang/rustfmt@v1
@@ -55,10 +56,11 @@ jobs:
         run: sudo apt-get install protobuf-compiler
 
       - name: Rust setup
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
           components: clippy
+          rustflags: ''
 
       - name: Run clippy lints
         uses: auguwu/[email protected]