Upgrade to the actions-rust-lang/setup-rust-toolchain action. (#485)

obi1kenobi · Oct 10, 2023 · d00f0a1 · d00f0a1
1 parent 8bd2479
commit d00f0a1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,10 +74,8 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+      - name: Install rust + caching
+        uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Set up python
         id: setup-python
@@ -150,15 +148,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install rust + caching
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: rustfmt, clippy
 
-      - uses: Swatinem/rust-cache@v2
-
-      - uses: r7kamura/rust-problem-matchers@v1
-
       - name: cargo clippy
         run: cargo clippy --workspace --all-features --all-targets --no-deps -- -D warnings --allow deprecated
 
@@ -179,10 +173,8 @@ jobs:
         with:
           persist-credentials: true
 
-      - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+      - name: Install rust + caching
+        uses: actions-rust-lang/setup-rust-toolchain@v1
 
       # Test all crates except trustfall_stubgen,
       # which is only tested if it has changed since its tests are a bit long.
@@ -215,17 +207,15 @@ jobs:
           persist-credentials: false
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: rustfmt, clippy
+          cache: false
 
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             ./trustfall_core/fuzz
 
-      - uses: r7kamura/rust-problem-matchers@v1
-
       - name: cargo clippy
         run: |
           cd trustfall_core/fuzz
@@ -253,17 +243,15 @@ jobs:
           persist-credentials: false
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: rustfmt, clippy
+          cache: false
 
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             ./experiments/trustfall_rustdoc
 
-      - uses: r7kamura/rust-problem-matchers@v1
-
       - name: cargo clippy
         run: |
           cd experiments/trustfall_rustdoc
@@ -294,10 +282,8 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+      - name: Install rust + caching
+        uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
@@ -357,8 +343,8 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install rust  # necessary for `npm run build:wasm` later
-        uses: dtolnay/rust-toolchain@stable
+      - name: Install rust + caching  # necessary for `npm run build:wasm` later
+        uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - uses: actions/setup-node@v3
         with:
@@ -396,7 +382,9 @@ jobs:
           persist-credentials: false
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
 
       - name: Publishing?
         id: version

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -44,7 +44,9 @@ jobs:
           persist-credentials: false
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
 
       - name: cargo update
         # Remove first line that always just says "Updating crates.io index"
@@ -171,7 +173,9 @@ jobs:
           persist-credentials: false
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
 
       - name: cargo update
         # Remove first line that always just says "Updating crates.io index"

diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml
@@ -76,7 +76,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
       - name: Show python version
         run: |
           python --version
@@ -120,7 +122,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
       - name: Show python version
         run: |
           python --version
@@ -155,6 +159,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
       - name: Show python version
         run: |
           python3 --version
@@ -227,8 +235,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: Swatinem/rust-cache@v2
-
       - id: check
         run: |
           set +e

diff --git a/.github/workflows/publish-rust.yml b/.github/workflows/publish-rust.yml
@@ -32,9 +32,9 @@ jobs:
           persist-credentials: true
 
       - name: Install rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: false
 
       - name: Tag the version
         run: |
@@ -57,8 +57,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@v2
-
       - id: check
         run: |
           set +e
@@ -84,8 +82,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@v2
-
       - name: Check semver
         uses: obi1kenobi/cargo-semver-checks-action@v1
         with: