@@ -13,20 +13,34 @@ jobs:
1313 # Swift 5.8.1
1414 - os : macos-13
1515 xcode : Xcode_14.3.1
16+ development-toolchain-download : " https://download.swift.org/development/xcode/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-osx.pkg"
17+ development-toolchain-tag : DEVELOPMENT-SNAPSHOT-2024-07-08-a
18+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
19+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
1620 # Swift 5.9.0
1721 - os : macos-13
1822 xcode : Xcode_15.0.1
23+ development-toolchain-download : " https://download.swift.org/development/xcode/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-osx.pkg"
24+ development-toolchain-tag : DEVELOPMENT-SNAPSHOT-2024-07-08-a
25+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
26+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
1927
2028 runs-on : ${{ matrix.os }}
2129 steps :
2230 - uses : actions/checkout@v3
2331 with :
2432 submodules : recursive
25- - id : setup-swiftwasm
26- uses : swiftwasm/setup-swiftwasm@v1
27- with :
28- swift-version : " wasm-5.8.0-RELEASE"
29- add-to-path : false
33+ - id : setup-development
34+ run : |
35+ toolchain_path="/Library/Developer/Toolchains/${{ matrix.development-toolchain-tag }}.xctoolchain"
36+ pkg="$(mktemp -d)/InstallMe.pkg"
37+ curl -L ${{ matrix.development-toolchain-download }} -o $pkg
38+ sudo installer -pkg $pkg -target /
39+ echo "toolchain-path=$toolchain_path" >> $GITHUB_OUTPUT
40+ "$toolchain_path/usr/bin/swift" sdk install "${{ matrix.wasi-swift-sdk-download }}"
41+ wasi_sdk_path=$("$toolchain_path/usr/bin/swift" sdk configure --show-configuration "${{ matrix.wasi-swift-sdk-id }}" wasm32-unknown-wasi | grep sdkRootPath: | cut -d: -f2)
42+ echo "wasi-swift-sdk-path=$(dirname $wasi_sdk_path)" >> $GITHUB_OUTPUT
43+
3044 - name : Select Xcode version
3145 run : sudo xcode-select -switch /Applications/${{ matrix.xcode }}.app
3246 - name : Configure Tests/default.json
@@ -46,13 +60,21 @@ jobs:
4660 matrix :
4761 include :
4862 - swift : " 5.8-focal"
49- swiftwasm-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.8.0-RELEASE/swift-wasm-5.8.0-RELEASE-ubuntu20.04_x86_64.tar.gz"
63+ development-toolchain-download : " https://download.swift.org/development/ubuntu2004/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu20.04.tar.gz"
64+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
65+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
5066 - swift : " 5.8-amazonlinux2"
51- swiftwasm-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.8.0-RELEASE/swift-wasm-5.8.0-RELEASE-amazonlinux2_x86_64.tar.gz"
67+ development-toolchain-download : " https://download.swift.org/development/amazonlinux2/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-amazonlinux2.tar.gz"
68+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
69+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
5270 - swift : " 5.9-focal"
53- swiftwasm-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.9.2-RELEASE/swift-wasm-5.9.2-RELEASE-ubuntu20.04_x86_64.tar.gz"
71+ development-toolchain-download : " https://download.swift.org/development/ubuntu2004/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-ubuntu20.04.tar.gz"
72+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
73+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
5474 - swift : " 5.9-amazonlinux2"
55- swiftwasm-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-5.9.2-RELEASE/swift-wasm-5.9.2-RELEASE-amazonlinux2_x86_64.tar.gz"
75+ development-toolchain-download : " https://download.swift.org/development/amazonlinux2/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a/swift-DEVELOPMENT-SNAPSHOT-2024-07-08-a-amazonlinux2.tar.gz"
76+ wasi-swift-sdk-download : " https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi.artifactbundle.zip"
77+ wasi-swift-sdk-id : DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi
5678
5779 runs-on : ubuntu-20.04
5880 name : " build-linux (${{ matrix.swift }})"
@@ -65,19 +87,23 @@ jobs:
6587 echo 'docker exec -i build-container "$@"' > ./build-exec
6688 chmod +x ./build-exec
6789
68- - name : Install WebAssembly toolchain
69- id : setup-swiftwasm
90+ - name : Install Development toolchain
91+ id : setup-development
7092 run : |
7193 toolchain_path="/opt/swiftwasm"
7294 ./build-exec mkdir -p "$toolchain_path"
73- curl -L ${{ matrix.swiftwasm -download }} | ./build-exec tar xz --strip-component 1 -C "$toolchain_path"
95+ curl -L ${{ matrix.development-toolchain -download }} | ./build-exec tar xz --strip-component 1 -C "$toolchain_path"
7496 echo "toolchain-path=$toolchain_path" >> $GITHUB_OUTPUT
97+ ./build-exec "$toolchain_path/usr/bin/swift" sdk install "${{ matrix.wasi-swift-sdk-download }}"
98+ wasi_sdk_path=$(./build-exec "$toolchain_path/usr/bin/swift" sdk configure --show-configuration "${{ matrix.wasi-swift-sdk-id }}" wasm32-unknown-wasi | grep sdkRootPath: | cut -d: -f2)
99+ echo "wasi-swift-sdk-path=$(dirname $wasi_sdk_path)" >> $GITHUB_OUTPUT
75100
76101 - name : Configure Tests/default.json
77102 run : |
78103 cat <<EOS > Tests/default.json
79104 {
80- "swiftExecutablePath": "${{ steps.setup-swiftwasm.outputs.toolchain-path }}/usr/bin/swift",
105+ "swiftExecutablePath": "${{ steps.setup-development.outputs.toolchain-path }}/usr/bin/swift",
106+ "wasiSwiftSDKPath": "${{ steps.setup-development.outputs.wasi-swift-sdk-path }}",
81107 "hostSwiftExecutablePath": "/usr/bin/swift"
82108 }
83109 EOS
0 commit comments