Merge a810686285 into 1c7cbc1e72

.github/workflows/check-and-build-and-test.yml

@@ -207,8 +207,7 @@ jobs:
           - runner: ubuntu-latest
             target: x86_64-unknown-linux-gnu
 
-          - prerequisite_step: rm ~/.cargo/bin/cargo.exe; rm ~/.cargo/bin/rust-analyzer.exe; rm ~/.cargo/bin/rustfmt.exe; rustup update
-            runner: windows-latest
+          - runner: windows-latest
             target: x86_64-pc-windows-msvc
     name: Verify MSRV of ${{ matrix.crate_directory }} for ${{ matrix.supporteds.target }} (on ${{ matrix.supporteds.runner }})
     runs-on: ${{ matrix.supporteds.runner }}
@@ -217,20 +216,19 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: Swatinem/rust-cache@v2
-        with:
-          shared-key: ${{ matrix.supporteds.target }}-latest-variable
-          cache-on-failure: "true"
-
-      - name: Run prerequisite setup step
-        if: matrix.supporteds.prerequisite_step
-        run: ${{ matrix.supporteds.prerequisite_step }}
+      - name: Install stable Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Install cargo-msrv
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-msrv
 
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: ${{ matrix.supporteds.target }}-latest-variable
+          cache-on-failure: "true"
+
       - name: Verify declared MSRV (minimum supported Rust version)
-        run: cargo-msrv verify --output-format json
+        run: cargo msrv verify --output-format json
         working-directory: ${{ matrix.crate_directory }}

.github/workflows/release-plz.yml

@@ -20,18 +20,13 @@ jobs:
         with:
           app-id: ${{ secrets.RELEASE_PLZ_GITHUB_APP_ID }}
           private-key: ${{ secrets.RELEASE_PLZ_GITHUB_APP_SECRET }}
-
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           token: ${{ steps.generate-token.outputs.token }}
-
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-
       - name: Run release-plz
         uses: MarcoIeni/release-plz-action@v0.5
         env: