From 122ca69855e026ab47f73f502d1c2263125e88d0 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 6 Nov 2020 23:37:25 +0900 Subject: [PATCH 1/2] Update toolchain version swift-wasm-5.3.0-RELEASE --- .github/workflows/perf.yml | 3 +-- .swift-version | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index a31d7f191..f2014323a 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -16,9 +16,8 @@ jobs: export SWIFTENV_ROOT="$HOME/.swiftenv" export PATH="$SWIFTENV_ROOT/bin:$PATH" eval "$(swiftenv init -)" - swiftenv install $TOOLCHAIN_DOWNLOAD + make bootstrap make perf-tester node ci/perf-tester env: - TOOLCHAIN_DOWNLOAD: https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3-SNAPSHOT-2020-08-10-a/swift-wasm-5.3-SNAPSHOT-2020-08-10-a-linux.tar.gz GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.swift-version b/.swift-version index a14e1af6f..8fc003603 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -wasm-5.3-SNAPSHOT-2020-10-20-a +wasm-5.3.0-RELEASE diff --git a/README.md b/README.md index f45847171..95fc4129d 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Just pass a toolchain archive URL for [the latest SwiftWasm 5.3 snapshot](https://github.com/swiftwasm/swift/releases) appropriate for your platform: ```sh -$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3-SNAPSHOT-2020-10-20-a/swift-wasm-5.3-SNAPSHOT-2020-10-20-a-macos_x86_64.pkg +$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.3.0-RELEASE/swift-wasm-5.3.0-RELEASE-macos_x86_64.pkg ``` You can also use the `install-toolchain.sh` helper script that uses a hardcoded toolchain snapshot: From 407ef62eecbb46d333100d72f6a3aff76970d3ba Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 6 Nov 2020 23:56:13 +0900 Subject: [PATCH 2/2] Address .wasm extension --- IntegrationTests/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile index e872e0c55..692eb0379 100644 --- a/IntegrationTests/Makefile +++ b/IntegrationTests/Makefile @@ -1,13 +1,13 @@ CONFIGURATION ?= debug FORCE: -TestSuites/.build/$(CONFIGURATION)/%: FORCE +TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE swift build --package-path TestSuites \ - --product $(notdir $@) \ + --product $(basename $(notdir $@)) \ --triple wasm32-unknown-wasi \ --configuration $(CONFIGURATION) -dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/% +dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm mkdir -p dist cp $< $@