Skip to content

Commit bdcb040

Browse files
authored
CI: Update and simplify Windows setup (jpsim#332)
Update the Windows CI to use 5.4.3 instead of 5.4.0. This update enables switching to gha-setup-swift which simplifies the CI setup for Windows.
1 parent b783fda commit bdcb040

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

.github/workflows/swiftpm.yml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,24 +75,10 @@ jobs:
7575
runs-on: windows-latest
7676
steps:
7777
- uses: actions/checkout@v2
78-
- uses: seanmiddleditch/gha-setup-vsdevenv@master
79-
- name: Install swift-5.4
80-
run: |
81-
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")
82-
- name: Set Environment Variables
83-
run: |
84-
echo "SDKROOT=C:\Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
85-
echo "DEVELOPER_DIR=C:\Library\Developer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
86-
- name: Adjust Paths
87-
run: |
88-
echo "C:\Library\Swift-development\bin;C:\Library\icu-67\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
89-
echo "C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
90-
- name: Install Supporting Files
91-
run: |
92-
Copy-Item "$env:SDKROOT\usr\share\ucrt.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\ucrt\module.modulemap"
93-
Copy-Item "$env:SDKROOT\usr\share\visualc.modulemap" -destination "$env:VCToolsInstallDir\include\module.modulemap"
94-
Copy-Item "$env:SDKROOT\usr\share\visualc.apinotes" -destination "$env:VCToolsInstallDir\include\visualc.apinotes"
95-
Copy-Item "$env:SDKROOT\usr\share\winsdk.modulemap" -destination "$env:UniversalCRTSdkDir\Include\$env:UCRTVersion\um\module.modulemap"
78+
- uses: compnerd/gha-setup-swift@main
79+
with:
80+
branch: swift-5.4.3-release
81+
tag: 5.4.3-RELEASE
9682
# Commands to run once connected via SSH:
9783
#
9884
# >d:

0 commit comments

Comments
 (0)