From 72870d6a7cd4230377bc1e092814cbc1a6667f2e Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 1 May 2021 08:24:40 -0700 Subject: [PATCH 1/5] CI: add Windows CI Add coverage for Windows with Swift 5.4 --- .github/workflows/ci.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bab94e..62ce8f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,3 +83,31 @@ jobs: - name: Build and Test run: | swift test --enable-test-discovery + + windows: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - uses: seanmiddleditch/gha-setup-vsdevenv@master + + - name: Install swift-5.4 + run: | + Install-Binary -Url "https://swift.org/builds/swift-5.4-release/windows10/swift-5.4-RELEASE/swift-5.4-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") + - name: Set Environment Variables + run: | + echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Adjust Paths + run: | + echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - name: Install Supporting Files + run: | + Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap" + Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap" + Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes" + Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap" + + - name: Build and Test + run: swift test --enable-test-discovery From 9e7e87189a469ed5ba55c9ec03132e05e8220605 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 May 2021 09:53:03 -0700 Subject: [PATCH 2/5] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62ce8f0..542aaaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,9 +91,9 @@ jobs: - uses: actions/checkout@v2 - uses: seanmiddleditch/gha-setup-vsdevenv@master - - name: Install swift-5.4 + - name: Install swift-5.5 (2021-04-19 SNAPSHOT) run: | - Install-Binary -Url "https://swift.org/builds/swift-5.4-release/windows10/swift-5.4-RELEASE/swift-5.4-RELEASE-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") + Install-Binary -Url "https://swift.org/builds/swift-5.5-branch/windows10/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a/swift-5.5-DEVELOPMENT-SNAPSHOT-2021-04-19-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q") - name: Set Environment Variables run: | echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append From f1abdadba83880969411c39dad3d4965acf87b9a Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 May 2021 10:02:35 -0700 Subject: [PATCH 3/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 542aaaf..3d62ef8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,4 +110,4 @@ jobs: Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap" - name: Build and Test - run: swift test --enable-test-discovery + run: swift test --enable-test-discovery -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolcahins\unknown-Asserts-development.xctoolchain\usr\lib From 265dd5843dfac7f249d617b10d49d00a14c35bcb Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 May 2021 10:09:54 -0700 Subject: [PATCH 4/5] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d62ef8..ed5a8e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,4 +110,4 @@ jobs: Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap" - name: Build and Test - run: swift test --enable-test-discovery -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolcahins\unknown-Asserts-development.xctoolchain\usr\lib + run: swift test --enable-test-discovery -Xcc -IC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\include -Xlinker -LC:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\lib From 338df7e719ecb8b4d45d702e7243fa81dd466b27 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 3 May 2021 10:47:15 -0700 Subject: [PATCH 5/5] Update Package@swift-5.5.swift Temporarily pin to 4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102 which would allow building on Windows. --- Package@swift-5.5.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 65acbee..2e502c0 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -16,7 +16,7 @@ let package = Package( // Dependencies declare other packages that this package depends on. .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", - .revision("release/5.5")), + .revision("4ae758ab85ed2a5d3e3e8b5050a8ce52179bd102")), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite.