From 7a9c80b709add780806792a46b9339b1cec61610 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 31 Mar 2022 17:50:53 +0100 Subject: [PATCH 1/9] Add macOS 12 with Xcode 13.3 to CI matrix --- .github/workflows/test.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3992b7d..e04670d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ 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 runs-on: ${{ matrix.os }} @@ -27,11 +27,20 @@ jobs: echo ${{ matrix.toolchain }} > .swift-version make test native-build: - # Check native build to make it easy to develop applications by Xcode + # Check native build to make it easy to develop applications by XcodeRELEASE name: Build for native target - runs-on: macos-11 + strategy: + matrix: + include: + - os: macos-10.15 + xcode: Xcode_12.5.1 + - 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/ From 0bab02de401a8bb92a708e5961f718fb0835e8a9 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 31 Mar 2022 17:51:19 +0100 Subject: [PATCH 2/9] Clean up comment --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e04670d4..1d79d1ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: echo ${{ matrix.toolchain }} > .swift-version make test native-build: - # Check native build to make it easy to develop applications by XcodeRELEASE + # Check native build to make it easy to develop applications by Xcode name: Build for native target strategy: matrix: From c089f427c16fff1e8e3efb2cb20f9004dd92bcf2 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 31 Mar 2022 17:53:54 +0100 Subject: [PATCH 3/9] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d79d1ab..54355fe8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: matrix: include: - os: macos-10.15 - xcode: Xcode_12.5.1 + xcode: Xcode_12.4 - os: macos-11 xcode: Xcode_13.2.1 - os: macos-12 From 30b6eb091e47608bb496b7c26a0aba107c4f5e63 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 31 Mar 2022 18:09:37 +0100 Subject: [PATCH 4/9] Add `wasm-5.6-SNAPSHOT-2022-03-23-a` to CI matrix --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54355fe8..4139918d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,6 +11,7 @@ jobs: os: [macos-10.15, macos-11, macos-12, ubuntu-18.04, ubuntu-20.04] toolchain: - wasm-5.5.0-RELEASE + - wasm-5.6-SNAPSHOT-2022-03-23-a runs-on: ${{ matrix.os }} steps: - name: Checkout From c461e9c37f024110e96c730b2c956e69028b3521 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 1 Apr 2022 11:07:18 +0100 Subject: [PATCH 5/9] Pass `-mexec-model=reactor` in tests `Makefile` --- IntegrationTests/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile index 6e1a4dd0..a446fa1a 100644 --- a/IntegrationTests/Makefile +++ b/IntegrationTests/Makefile @@ -7,6 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE --product $(basename $(notdir $@)) \ --triple wasm32-unknown-wasi \ --configuration $(CONFIGURATION) \ + -Xswiftc -mexec-model=reactor \ $(SWIFT_BUILD_FLAGS) dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm From 2ae1bdf227fa81e18f85a6ac20c0a6bde9589433 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 1 Apr 2022 11:11:30 +0100 Subject: [PATCH 6/9] Use `-Xclang-linker` --- IntegrationTests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile index a446fa1a..bb9262d0 100644 --- a/IntegrationTests/Makefile +++ b/IntegrationTests/Makefile @@ -7,7 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE --product $(basename $(notdir $@)) \ --triple wasm32-unknown-wasi \ --configuration $(CONFIGURATION) \ - -Xswiftc -mexec-model=reactor \ + -Xclang-linker -mexec-model=reactor \ $(SWIFT_BUILD_FLAGS) dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm From 53edf26f0df60846a5538d79698aafa05680fce2 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 1 Apr 2022 11:13:15 +0100 Subject: [PATCH 7/9] Use both `-Xswiftc` and `-Xclang-linker` --- IntegrationTests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile index bb9262d0..2af13d93 100644 --- a/IntegrationTests/Makefile +++ b/IntegrationTests/Makefile @@ -7,7 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE --product $(basename $(notdir $@)) \ --triple wasm32-unknown-wasi \ --configuration $(CONFIGURATION) \ - -Xclang-linker -mexec-model=reactor \ + -Xswiftc -Xclang-linker -mexec-model=reactor \ $(SWIFT_BUILD_FLAGS) dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm From 5538cb417149756d1ece03064192d99ae7697390 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 1 Apr 2022 11:31:57 +0100 Subject: [PATCH 8/9] Pass `-Xswiftc` twice --- IntegrationTests/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile index 2af13d93..575a8f20 100644 --- a/IntegrationTests/Makefile +++ b/IntegrationTests/Makefile @@ -7,7 +7,7 @@ TestSuites/.build/$(CONFIGURATION)/%.wasm: FORCE --product $(basename $(notdir $@)) \ --triple wasm32-unknown-wasi \ --configuration $(CONFIGURATION) \ - -Xswiftc -Xclang-linker -mexec-model=reactor \ + -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor \ $(SWIFT_BUILD_FLAGS) dist/%.wasm: TestSuites/.build/$(CONFIGURATION)/%.wasm From 2d73a08828061961d9f50c8e45f649838c9ea4f4 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 1 Apr 2022 13:40:39 +0100 Subject: [PATCH 9/9] Use `wasm-5.6.0-RELEASE` --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4139918d..0f2418e9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: os: [macos-10.15, macos-11, macos-12, ubuntu-18.04, ubuntu-20.04] toolchain: - wasm-5.5.0-RELEASE - - wasm-5.6-SNAPSHOT-2022-03-23-a + - wasm-5.6.0-RELEASE runs-on: ${{ matrix.os }} steps: - name: Checkout