Skip to content

Commit 8bd1d02

Browse files
Stop using the setup-swift action
swift-actions/setup-swift#591
1 parent 73ee9b6 commit 8bd1d02

File tree

1 file changed

+29
-16
lines changed

1 file changed

+29
-16
lines changed

.github/workflows/swift.yml

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,25 @@ on:
77
branches: [main]
88

99
jobs:
10-
swift-test:
10+
swift-test-macos:
11+
name: Build and test on macOS with Swift ${{ matrix.swift_version }}
12+
timeout-minutes: 40
13+
runs-on: macos-13
1114
strategy:
1215
matrix:
1316
include:
1417
- os: macos-13 # TODO: macos-14 runner expected in October-December 2023
1518
swift_version: "5.9"
1619
xcode: /Applications/Xcode_15.0.app/Contents/Developer
17-
- os: ubuntu-22.04
18-
swift_version: "5.9"
19-
name: Build on ${{ matrix.os }} with Swift ${{ matrix.swift_version }}
20-
timeout-minutes: 40
21-
runs-on: ${{ matrix.os }}
2220

2321
steps:
2422
- uses: actions/checkout@v4
25-
- uses: swift-actions/setup-swift@v1
26-
if: ${{ !startsWith(matrix.os, 'macos') }}
27-
with:
28-
swift-version: ${{ matrix.swift_version }}
2923

3024
- name: Select Xcode version
31-
if: startsWith(matrix.os, 'macos')
3225
run: sudo xcode-select --switch ${{ matrix.xcode }}
3326

3427
- name: Install dependencies for macOS
3528
run: brew bundle
36-
if: startsWith(matrix.os, 'macos')
37-
38-
- name: Install dependencies for Ubuntu
39-
if: startsWith(matrix.os, 'ubuntu')
40-
run: sudo apt-get install wabt binaryen -y
4129

4230
- uses: bytecodealliance/actions/wasmtime/setup@v1
4331

@@ -58,3 +46,28 @@ jobs:
5846
run: swift test
5947
env:
6048
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
50+
swift-test-linux:
51+
name: Build and test on Linux with Swift ${{ matrix.swift_version }}
52+
timeout-minutes: 40
53+
runs-on: ubuntu-22.04
54+
container: swift:${{ matrix.swift_version }}
55+
strategy:
56+
matrix:
57+
include:
58+
- swift_version: "5.9"
59+
60+
steps:
61+
- uses: actions/checkout@v4
62+
- name: Install dependencies for Ubuntu
63+
run: apt-get update && apt-get install wabt binaryen -y
64+
65+
- uses: bytecodealliance/actions/wasmtime/setup@v1
66+
67+
- uses: actions/setup-node@v2
68+
with:
69+
node-version: '20'
70+
- run: swift build
71+
- run: swift test
72+
env:
73+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)