From 30470b1c30a161d9e7b2e1b44eb5b452d38a894e Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Sun, 5 Oct 2025 16:24:11 +0900 Subject: [PATCH] CI: Partially revert b72ca8cd79e3a7b3c15a9d323576fbdd7cdbc59c --- .github/workflows/main.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecaf191d..701a47cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -217,8 +217,8 @@ jobs: steps: - uses: compnerd/gha-setup-swift@main with: - branch: swift-6.0.3-release - tag: 6.0.3-RELEASE + swift-version: swift-6.2-release + swift-build: 6.2-RELEASE - uses: actions/checkout@v4 - run: python3 ./Vendor/checkout-dependency # FIXME: CMake build is failing on CI due to "link: extra operand '/OUT:lib\\libXXXX.a'" error @@ -232,17 +232,7 @@ jobs: # - run: cmake --build .build/cmake # Run tests with SwiftPM - name: Run tests with SwiftPM - run: | - # Workaround for https://github.com/compnerd/swift-build/issues/909 - $Win10SdkRoot = Get-ItemPropertyValue ` - -Path "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots" ` - -Name "KitsRoot10" - $WinSDKVersion = "10.0.22621.0" - $ExtraFlags = @("-Xswiftc", "-windows-sdk-version", "-Xswiftc", "${WinSDKVersion}", - "-Xswiftc", "-windows-sdk-root", "-Xswiftc", "${Win10SdkRoot}", - "-Xbuild-tools-swiftc", "-windows-sdk-version", "-Xbuild-tools-swiftc", "${WinSDKVersion}", - "-Xbuild-tools-swiftc", "-windows-sdk-root", "-Xbuild-tools-swiftc", "${Win10SdkRoot}") - swift test @ExtraFlags + run: swift test build-cmake: runs-on: ubuntu-22.04