Skip to content

Use swiftwasm/setup-swiftwasm instead of swiftenv on CI #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 9, 2022
Merged

Use swiftwasm/setup-swiftwasm instead of swiftenv on CI #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d877d70
Use swiftwasm/setup-swiftwasm instead of swiftenv on CI
kateinoigakukun Oct 8, 2022
84e2bd2
Update .github/workflows/perf.yml also
kateinoigakukun Oct 8, 2022
a0333d5
Update .github/workflows/compatibility.yml also
kateinoigakukun Oct 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/compatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/perf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

.PHONY: bootstrap
bootstrap:
./scripts/install-toolchain.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this script file be deleted too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still useful for installing the default toolchain without carton, and I still use it.

npm ci

.PHONY: build
Expand Down