Merge pull request #1697 from vdice/ci/rm-rust-toolchain-action

ci(.github): discontinue use of unmaintained actions
fermyon · Aug 16, 2023 · 45b14fb · 45b14fb
2 parents 0594d20 + 77afa73
commit 45b14fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml
@@ -93,12 +93,11 @@ runs:
   using: "composite"
   steps:
     - name: Install latest Rust stable toolchain
-      uses: actions-rs/toolchain@v1
+      shell: bash
       if: ${{ inputs.rust == 'true' }}
-      with:
-        toolchain: ${{ inputs.rust-version }}
-        default: true
-        components: clippy, rustfmt
+      run: |
+        rustup toolchain install ${{ inputs.rust-version }} --component clippy --component rustfmt
+        rustup default ${{ inputs.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
@@ -6,6 +6,9 @@ on:
     tags:
       - "v*"
 
+env:
+  RUST_VERSION: 1.68
+
 jobs:
   build-and-sign:
     name: build and sign release assets
@@ -85,14 +88,18 @@ jobs:
           cosign-release: v2.0.0
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.68
-          default: true
-          target: ${{ matrix.config.target }}
+        shell: bash
+        run: |
+          rustup toolchain install ${{ env.RUST_VERSION }}
+          rustup default ${{ env.RUST_VERSION }}
+
+      - name: Install 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 1.68 && rustup target add wasm32-unknown-unknown --toolchain 1.68
+        run: rustup target add wasm32-wasi --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
 
       - name: setup for cross-compiled linux aarch64 build
         if: matrix.config.target == 'aarch64-unknown-linux-gnu'
@@ -103,10 +110,8 @@ jobs:
           echo 'linker = "aarch64-linux-gnu-gcc"' >> ${HOME}/.cargo/config.toml
 
       - name: build release
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: "--all-features --release ${{ matrix.config.extraArgs }}"
+        shell: bash
+        run: cargo build --all-features --release ${{ matrix.config.extraArgs }}
 
       - name: Sign the binary with GitHub OIDC token
         shell: bash