diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml index 422e08c48..489c7aac4 100644 --- a/.github/workflows/compatibility.yml +++ b/.github/workflows/compatibility.yml @@ -6,19 +6,16 @@ on: jobs: test: name: Check source code compatibility - runs-on: Ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v2 with: fetch-depth: 1 + - uses: swiftwasm/setup-swiftwasm@v1 - name: Run Test run: | set -eux - git clone https://github.com/kylef/swiftenv.git ~/.swiftenv - export SWIFTENV_ROOT="$HOME/.swiftenv" - export PATH="$SWIFTENV_ROOT/bin:$PATH" - eval "$(swiftenv init -)" make bootstrap cd Example/JavaScriptKitExample swift build --triple wasm32-unknown-wasi diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index f2014323a..2fdba41dd 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -4,18 +4,15 @@ on: [pull_request] jobs: perf: - runs-on: Ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@master with: fetch-depth: 1 + - uses: swiftwasm/setup-swiftwasm@v1 - name: Run Benchmark run: | - git clone https://github.com/kylef/swiftenv.git ~/.swiftenv - export SWIFTENV_ROOT="$HOME/.swiftenv" - export PATH="$SWIFTENV_ROOT/bin:$PATH" - eval "$(swiftenv init -)" make bootstrap make perf-tester node ci/perf-tester diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6b0db563..d41966fe3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,15 +33,9 @@ jobs: uses: actions/checkout@master with: fetch-depth: 1 - - name: Install swiftenv - run: | - git clone https://github.com/kylef/swiftenv.git ~/.swiftenv - export SWIFTENV_ROOT="$HOME/.swiftenv" - export PATH="$SWIFTENV_ROOT/bin:$PATH" - eval "$(swiftenv init -)" - echo $PATH >> $GITHUB_PATH - env >> $GITHUB_ENV - echo ${{ matrix.entry.toolchain }} > .swift-version + - uses: swiftwasm/setup-swiftwasm@v1 + with: + swift-version: ${{ matrix.entry.toolchain }} - run: make bootstrap - run: make test - run: make unittest diff --git a/Makefile b/Makefile index 7b8736221..ccf22798d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST))) .PHONY: bootstrap bootstrap: - ./scripts/install-toolchain.sh npm ci .PHONY: build