From d877d704175beb658bfffe79cc370884589aac69 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sat, 8 Oct 2022 04:19:25 +0000 Subject: [PATCH] Use swiftwasm/setup-swiftwasm instead of swiftenv on CI --- .github/workflows/test.yml | 12 +++--------- Makefile | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) 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