Skip to content

Commit 2094101

Browse files
Install .swift-version toolchain on CI
1 parent 8cc56bf commit 2094101

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

.github/workflows/perf.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ jobs:
1616
export SWIFTENV_ROOT="$HOME/.swiftenv"
1717
export PATH="$SWIFTENV_ROOT/bin:$PATH"
1818
eval "$(swiftenv init -)"
19-
swiftenv install $TOOLCHAIN_DOWNLOAD
19+
./ci/scripts/install-toolchain.sh
2020
make perf-tester
2121
node ci/perf-tester
2222
env:
23-
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
2423
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ jobs:
66
strategy:
77
matrix:
88
os: [macOS-10.15, Ubuntu-18.04]
9-
include:
10-
- os: macOS-10.15
11-
toolchain: 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-osx.tar.gz
12-
- os: Ubuntu-18.04
13-
toolchain: 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
149
runs-on: ${{ matrix.os }}
1510
steps:
1611
- name: Checkout
@@ -23,8 +18,6 @@ jobs:
2318
export SWIFTENV_ROOT="$HOME/.swiftenv"
2419
export PATH="$SWIFTENV_ROOT/bin:$PATH"
2520
eval "$(swiftenv init -)"
26-
swiftenv install $TOOLCHAIN_DOWNLOAD
21+
./ci/scripts/install-toolchain.sh
2722
make bootstrap
2823
make test
29-
env:
30-
TOOLCHAIN_DOWNLOAD: ${{ matrix.toolchain }}

ci/scripts/install-toolchain.sh

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/bin/bash
2+
set -eu
3+
4+
scripts_dir="$(cd "$(dirname $0)" && pwd)"
5+
SWIFT_TAG="swift-$(cat $scripts_dir/../../.swift-version)"
6+
7+
if [ -z "$(which swiftenv)" ]; then
8+
echo "swiftenv not installed, please install it before this script"
9+
exit 1
10+
fi
11+
12+
case $(uname -s) in
13+
Darwin)
14+
TOOLCHAIN_DOWNLOAD="$SWIFT_TAG-osx.tar.gz"
15+
;;
16+
Linux)
17+
if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then
18+
TOOLCHAIN_DOWNLOAD="$SWIFT_TAG-ubuntu18.04.tar.gz"
19+
elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then
20+
TOOLCHAIN_DOWNLOAD="$SWIFT_TAG-ubuntu20.04.tar.gz"
21+
else
22+
echo "Unknown Ubuntu version"
23+
exit 1
24+
fi
25+
;;
26+
*)
27+
echo "Unrecognised platform $(uname -s)"
28+
exit 1
29+
;;
30+
esac
31+
32+
TOOLCHAIN_DOWNLOAD_URL="https://github.com/swiftwasm/swift/releases/download/$SWIFT_TAG/$TOOLCHAIN_DOWNLOAD"
33+
34+
swiftenv install "$TOOLCHAIN_DOWNLOAD_URL"

0 commit comments

Comments
 (0)