Skip to content

Commit 0a38d70

Browse files
authored
Add 5.6 release and macOS 12 with Xcode 13.3 to CI matrix (#176)
* Add macOS 12 with Xcode 13.3 to CI matrix * Clean up comment * Update test.yml * Add `wasm-5.6-SNAPSHOT-2022-03-23-a` to CI matrix * Pass `-mexec-model=reactor` in tests `Makefile` * Use `-Xclang-linker` * Use both `-Xswiftc` and `-Xclang-linker` * Pass `-Xswiftc` twice * Use `wasm-5.6.0-RELEASE`
1 parent 2011cc0 commit 0a38d70

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/test.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ jobs:
88
name: Build and Test
99
strategy:
1010
matrix:
11-
os: [macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04]
11+
os: [macos-10.15, macos-11, macos-12, ubuntu-18.04, ubuntu-20.04]
1212
toolchain:
1313
- wasm-5.5.0-RELEASE
14+
- wasm-5.6.0-RELEASE
1415
runs-on: ${{ matrix.os }}
1516
steps:
1617
- name: Checkout
@@ -29,9 +30,18 @@ jobs:
2930
native-build:
3031
# Check native build to make it easy to develop applications by Xcode
3132
name: Build for native target
32-
runs-on: macos-11
33+
strategy:
34+
matrix:
35+
include:
36+
- os: macos-10.15
37+
xcode: Xcode_12.4
38+
- os: macos-11
39+
xcode: Xcode_13.2.1
40+
- os: macos-12
41+
xcode: Xcode_13.3
42+
runs-on: ${{ matrix.os }}
3343
steps:
3444
- uses: actions/checkout@v2
3545
- run: swift build
3646
env:
37-
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer/
47+
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/

IntegrationTests/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE
77
--product $(basename $(notdir $@)) \
88
--triple wasm32-unknown-wasi \
99
--configuration $(CONFIGURATION) \
10+
-Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor \
1011
$(SWIFT_BUILD_FLAGS)
1112

1213
dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm

0 commit comments

Comments
 (0)