From 51b09d9299398663019b382e03dc3e32f2ce7c0a Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 11 Jul 2024 13:48:17 +0200
Subject: [PATCH] Apply fixes to release process as well

---
 .github/workflows/release.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c164bb8..8c19c5d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,8 @@ concurrency: ${{ github.workflow }}
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: 1.76
+  CARGO_COMPONENT_VERSION: 0.14.0
+  RUST_VERSION: 1.79
   WASI_SDK_VERSION: "22.0"
   WASI_SDK_RELEASE: wasi-sdk-22
 
@@ -40,14 +41,14 @@ jobs:
               targetDir: "target/release",
             }
           - {
-            os: "ubuntu-20.04",
-            arch: "aarch64",
-            wasiSDK: "linux",
-            extension: "",
-            buildArgs: "--target aarch64-unknown-linux-gnu",
-            target: "aarch64-unknown-linux-gnu",
-            targetDir: "target/aarch64-unknown-linux-gnu/release",
-          }
+              os: "ubuntu-20.04",
+              arch: "aarch64",
+              wasiSDK: "linux",
+              extension: "",
+              buildArgs: "--target aarch64-unknown-linux-gnu",
+              target: "aarch64-unknown-linux-gnu",
+              targetDir: "target/aarch64-unknown-linux-gnu/release",
+            }
           - {
               os: "macos-latest",
               arch: "amd64",
@@ -80,12 +81,13 @@ jobs:
         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 }}
+        run: rustup target add wasm32-wasip1 --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-wasi --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }}
 
       - name: Install cargo-component
         uses: baptiste0928/cargo-install@v3
         with:
           crate: cargo-component
+          version: ${{ env.CARGO_COMPONENT_VERSION }}
 
       - name: Install WASI-SDK
         shell: bash
@@ -135,8 +137,8 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-            name: spin-test-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}
-            path: _dist/spin-test-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
+          name: spin-test-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}
+          path: _dist/spin-test-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
 
       - name: upload binary to Github release
         if: startsWith(github.ref, 'refs/tags/v')
@@ -219,7 +221,7 @@ jobs:
           pattern: spin-test-*
           merge-multiple: true
 
-      - name: 'Check if canary tag exists'
+      - name: "Check if canary tag exists"
         id: canaryExists
         shell: bash
         run: |