Skip to content

Commit fa86bf4

Browse files
CI: Partially revert b72ca8c
1 parent b1525db commit fa86bf4

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ jobs:
217217
steps:
218218
- uses: compnerd/gha-setup-swift@main
219219
with:
220-
branch: swift-6.0.3-release
221-
tag: 6.0.3-RELEASE
220+
swift-version: swift-6.2-release
221+
swift-build: 6.2-RELEASE
222222
- uses: actions/checkout@v4
223223
- run: python3 ./Vendor/checkout-dependency
224224
# FIXME: CMake build is failing on CI due to "link: extra operand '/OUT:lib\\libXXXX.a'" error
@@ -232,17 +232,7 @@ jobs:
232232
# - run: cmake --build .build/cmake
233233
# Run tests with SwiftPM
234234
- name: Run tests with SwiftPM
235-
run: |
236-
# Workaround for https://github.com/compnerd/swift-build/issues/909
237-
$Win10SdkRoot = Get-ItemPropertyValue `
238-
-Path "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots" `
239-
-Name "KitsRoot10"
240-
$WinSDKVersion = "10.0.22621.0"
241-
$ExtraFlags = @("-Xswiftc", "-windows-sdk-version", "-Xswiftc", "${WinSDKVersion}",
242-
"-Xswiftc", "-windows-sdk-root", "-Xswiftc", "${Win10SdkRoot}",
243-
"-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", "${WinSDKVersion}",
244-
"-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", "${Win10SdkRoot}")
245-
swift test @ExtraFlags
235+
run: swift test
246236

247237
build-cmake:
248238
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)