Merge pull request #198 from itowlson/ci-having-a-tanty

Fix CI Rust install failures
fermyon · May 8, 2024 · b60be9c · b60be9c
2 parents 86ec6f2 + f950137
commit b60be9c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.73
+  RUST_VERSION: 1.74
 jobs:
   lint-rust:
     name: Lint Rust
@@ -32,7 +32,7 @@ jobs:
       # install dependencies
       - name: Install latest Rust stable toolchain
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt
+          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt --no-self-update
           rustup default ${{ env.RUST_VERSION }}
       - name: "Install Wasm Rust target"
         run: rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown
@@ -61,7 +61,7 @@ jobs:
       # install dependencies
       - name: Install latest Rust stable toolchain
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt
+          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt --no-self-update
           rustup default ${{ env.RUST_VERSION }}
       - name: "Install Wasm Rust target"
         run: rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown
@@ -87,7 +87,7 @@ jobs:
       # install dependencies
       - name: Install latest Rust stable toolchain
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt
+          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt --no-self-update
           rustup default ${{ env.RUST_VERSION }}
       - name: "Install Wasm Rust target"
         run: rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ concurrency: ${{ github.workflow }}
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.73
+  RUST_VERSION: 1.74
 
 jobs:
   build:
@@ -76,20 +76,23 @@ jobs:
               targetDir: "target/release",
             }
     steps:
-      - uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        shell: bash
+      # install dependencies
+      - name: Install latest Rust stable toolchain
         run: |
-          rustup toolchain install ${{ env.RUST_VERSION }}
+          rustup toolchain install ${{ env.RUST_VERSION }} --component clippy --component rustfmt --no-self-update
           rustup default ${{ env.RUST_VERSION }}
+      - name: "Install Wasm Rust target"
+        run: rustup target add wasm32-wasi --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
+      - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: "${{ runner.os }}-full-${{ hashFiles('./Cargo.lock') }}"
 
-      - name: Install target
+      - name: Install cross-compilation target
         if: matrix.config.target != ''
         shell: bash
         run: rustup target add --toolchain ${{ env.RUST_VERSION }} ${{ matrix.config.target }}
 
-      - name: "Install Wasm Rust target"
-        run: rustup target add wasm32-wasi --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
+      - uses: actions/checkout@v4
 
       - name: set the release version (main)
         shell: bash

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ edition = { workspace = true }
 version = "0.8.0"
 authors = ["Fermyon Engineering <engineering@fermyon.com>"]
 edition = "2021"
+rust-version = "1.74"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html