From 12ed5d83ce1b2e35d777683f692628b37cec41b8 Mon Sep 17 00:00:00 2001 From: itowlson Date: Tue, 19 Nov 2024 16:16:46 +1300 Subject: [PATCH 1/2] CI now needs wasm32-wasip1 Signed-off-by: itowlson --- .github/actions/spin-ci-dependencies/action.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml index 78d3a6541f..118be48775 100644 --- a/.github/actions/spin-ci-dependencies/action.yml +++ b/.github/actions/spin-ci-dependencies/action.yml @@ -95,7 +95,7 @@ runs: rustup default ${{ inputs.rust-version }} - name: "Install Wasm Rust target" - run: rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown + run: rustup target add wasm32-wasi && rustup target add wasm32-wasip1 &&rustup target add wasm32-unknown-unknown if: ${{ inputs.rust-wasm == 'true' }} shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7653b2c221..fc4f24edf5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,7 +103,7 @@ 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-wasi --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-wasip1 --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' From e95713e4220c1baf5954d163eb0f5799655b0e77 Mon Sep 17 00:00:00 2001 From: Lann Martin Date: Tue, 19 Nov 2024 11:24:19 -0500 Subject: [PATCH 2/2] ci: Rationalize rustup target adds Signed-off-by: Lann Martin --- .github/actions/spin-ci-dependencies/action.yml | 2 +- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/spin-ci-dependencies/action.yml b/.github/actions/spin-ci-dependencies/action.yml index 118be48775..20cc9a8e3a 100644 --- a/.github/actions/spin-ci-dependencies/action.yml +++ b/.github/actions/spin-ci-dependencies/action.yml @@ -95,7 +95,7 @@ runs: rustup default ${{ inputs.rust-version }} - name: "Install Wasm Rust target" - run: rustup target add wasm32-wasi && rustup target add wasm32-wasip1 &&rustup target add wasm32-unknown-unknown + run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown if: ${{ inputs.rust-wasm == 'true' }} shell: bash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e13115b7eb..20c64cb52a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -196,7 +196,7 @@ jobs: # Install all the toolchain dependencies - name: Install Rust wasm target - run: rustup target add wasm32-wasi && rustup target add wasm32-unknown-unknown + run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown - uses: goto-bus-stop/setup-zig@v2 - uses: actions/setup-go@v4 with: @@ -281,7 +281,7 @@ 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-wasi wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }} - name: setup for cross-compiled linux aarch64 build if: matrix.config.target == 'aarch64-unknown-linux-gnu' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc4f24edf5..01e4ea5aaa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,7 +103,7 @@ 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-wasip1 --toolchain ${{ env.RUST_VERSION }} && rustup target add wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }} + run: rustup target add wasm32-wasi wasm32-wasip1 wasm32-unknown-unknown --toolchain ${{ env.RUST_VERSION }} - name: setup for cross-compiled linux aarch64 build if: matrix.config.target == 'aarch64-unknown-linux-gnu'