Skip to content

Commit 938a037

Browse files
authored
[CI] Re-enable Windows CI job (jpsim#306)
Fixed in jpsim#305 Also take this opportunity to update the Swift snapshot to a more recent version.
1 parent 780e2ad commit 938a037

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

.github/workflows/swiftpm.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,23 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@v2
5454
- uses: seanmiddleditch/gha-setup-vsdevenv@master
55-
- name: Install swift-DEVELOPMENT-SNAPSHOT-2020-10-29-a
56-
run: Install-Binary -Url "https://swift.org/builds/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2020-10-29-a/swift-DEVELOPMENT-SNAPSHOT-2020-10-29-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
55+
- name: Install swift-DEVELOPMENT-SNAPSHOT-2021-02-18-a
56+
run: |
57+
Install-Binary -Url "https://swift.org/builds/development/windows10/swift-DEVELOPMENT-SNAPSHOT-2021-02-18-a/swift-DEVELOPMENT-SNAPSHOT-2021-02-18-a-windows10.exe" -Name "installer.exe" -ArgumentList ("-q")
5758
- name: Set Environment Variables
5859
run: |
5960
echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6061
echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
6162
- name: Adjust Paths
62-
run: echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
63+
run: |
64+
echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
65+
echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
6366
- name: Install Supporting Files
64-
shell: cmd
6567
run: |
66-
copy "%SDKROOT%\usr\share\ucrt.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap"
67-
copy "%SDKROOT%\usr\share\visualc.modulemap" "%VCToolsInstallDir%\include\module.modulemap"
68-
copy "%SDKROOT%\usr\share\visualc.apinotes" "%VCToolsInstallDir%\include\visualc.apinotes"
69-
copy "%SDKROOT%\usr\share\winsdk.modulemap" "%UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap"
70-
# Broken. Re-enable when fixed. See https://github.com/jpsim/Yams/pull/304 for details and attempts to fix.
71-
# - name: Build
72-
# run: swift build -v
68+
Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
69+
Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
70+
Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
71+
Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
7372
# Commands to run once connected via SSH:
7473
#
7574
# >d:
@@ -84,5 +83,7 @@ jobs:
8483
# with:
8584
# NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
8685
# SSH_PASS: ${{ secrets.SSH_PASS }}
87-
# - name: Test
88-
# run: swift test -v
86+
- name: Build
87+
run: swift build -v
88+
- name: Test
89+
run: swift test -v

0 commit comments

Comments
 (0)