Skip to content

Commit 612ae86

Browse files
Test for multiple version of toolchains
1 parent 7f41fb4 commit 612ae86

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ jobs:
99
strategy:
1010
matrix:
1111
os: [macOS-10.15, Ubuntu-18.04]
12+
toolchain:
13+
- wasm-5.3.0-RELEASE
14+
- wasm-5.4-SNAPSHOT-2021-08-07-a
15+
# - wasm-5.4.0-RELEASE
1216
runs-on: ${{ matrix.os }}
1317
steps:
1418
- name: Checkout
@@ -21,5 +25,6 @@ jobs:
2125
export SWIFTENV_ROOT="$HOME/.swiftenv"
2226
export PATH="$SWIFTENV_ROOT/bin:$PATH"
2327
eval "$(swiftenv init -)"
24-
make bootstrap
28+
SWIFT_VERSION=${{ matrix.toolchain }} make bootstrap
29+
echo ${{ matrix.toolchain }} > .swift-version
2530
make test

scripts/install-toolchain.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ set -eu
33

44
scripts_dir="$(cd "$(dirname $0)" && pwd)"
55

6-
swift_version="$(cat $scripts_dir/../.swift-version)"
7-
swift_tag="swift-$swift_version"
6+
default_swift_version="$(cat $scripts_dir/../.swift-version)"
7+
SWIFT_VERSION="${SWIFT_VERSION:-$default_swift_version}"
8+
swift_tag="swift-$SWIFT_VERSION"
89

910
if [ -z "$(which swiftenv)" ]; then
1011
echo "swiftenv not installed, please install it before this script."
1112
exit 1
1213
fi
1314

14-
if [ ! -z "$(swiftenv versions | grep $swift_version)" ]; then
15-
echo "$swift_version is already installed."
15+
if [ ! -z "$(swiftenv versions | grep $SWIFT_VERSION)" ]; then
16+
echo "$SWIFT_VERSION is already installed."
1617
exit 0
1718
fi
1819

0 commit comments

Comments
 (0)