From 08322d7d726815cfe3d443e3651f0f224672f9ac Mon Sep 17 00:00:00 2001 From: Adam Ward Date: Tue, 18 Mar 2025 14:39:04 -0400 Subject: [PATCH] Specify Visual C and Windows SDK versions Hardcoding to versions we knew worked to unblock the vscode tests until there's a better fix for https://github.com/swiftlang/github-workflows/issues/103 --- .github/workflows/pull_request.yml | 2 +- scripts/test_windows.ps1 | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f9e673fee..f904a6cb5 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ on: jobs: tests: name: ${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && 'Full Test Run' || 'Test'}} - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + uses: award999/github-workflows/.github/workflows/swift_package_test.yml@win-11-sdk with: # Linux linux_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly-main"}]' diff --git a/scripts/test_windows.ps1 b/scripts/test_windows.ps1 index 78a45704f..b292bd5a7 100644 --- a/scripts/test_windows.ps1 +++ b/scripts/test_windows.ps1 @@ -18,6 +18,14 @@ npm ci -ignore-script node-pty npm run lint npm run format npm run package +$User_Directory=".vscode-test\user-data\User" +New-Item $User_Directory -type directory -force +$Settings = @' +{ + "swift.buildArguments": ["-Xswiftc", "-visualc-tools-version", "-Xswiftc", "14.42.34433", "-Xswiftc", "-windows-sdk-version", "-Xswiftc", "10.0.22000.0"] +} +'@ +$Settings | Set-Content "$User_Directory\settings.json" $Process = Start-Process npm "run integration-test" -Wait -PassThru -NoNewWindow if ($Process.ExitCode -eq 0) { Write-Host 'SUCCESS'