Skip to content

Commit

Permalink
Add 5.6 release and macOS 12 with Xcode 13.3 to CI matrix (#176)
Browse files Browse the repository at this point in the history
* 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`
  • Loading branch information
MaxDesiatov authored Apr 1, 2022
1 parent 2011cc0 commit 0a38d70
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
16 changes: 13 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ jobs:
name: Build and Test
strategy:
matrix:
os: [macos-10.15, macos-11, ubuntu-18.04, ubuntu-20.04]
os: [macos-10.15, macos-11, macos-12, ubuntu-18.04, ubuntu-20.04]
toolchain:
- wasm-5.5.0-RELEASE
- wasm-5.6.0-RELEASE
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand All @@ -29,9 +30,18 @@ jobs:
native-build:
# Check native build to make it easy to develop applications by Xcode
name: Build for native target
runs-on: macos-11
strategy:
matrix:
include:
- os: macos-10.15
xcode: Xcode_12.4
- os: macos-11
xcode: Xcode_13.2.1
- os: macos-12
xcode: Xcode_13.3
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- run: swift build
env:
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer/
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer/
1 change: 1 addition & 0 deletions IntegrationTests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE
--product $(basename $(notdir $@)) \
--triple wasm32-unknown-wasi \
--configuration $(CONFIGURATION) \
-Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor \
$(SWIFT_BUILD_FLAGS)

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

0 comments on commit 0a38d70

Please sign in to comment.