Skip to content

Commit 08322d7

Browse files
committed
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 swiftlang/github-workflows#103
1 parent 41e8872 commit 08322d7

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/workflows/pull_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
tests:
99
name: ${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && 'Full Test Run' || 'Test'}}
10-
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
10+
uses: award999/github-workflows/.github/workflows/swift_package_test.yml@win-11-sdk
1111
with:
1212
# Linux
1313
linux_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly-main"}]'

scripts/test_windows.ps1

+8
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ npm ci -ignore-script node-pty
1818
npm run lint
1919
npm run format
2020
npm run package
21+
$User_Directory=".vscode-test\user-data\User"
22+
New-Item $User_Directory -type directory -force
23+
$Settings = @'
24+
{
25+
"swift.buildArguments": ["-Xswiftc", "-visualc-tools-version", "-Xswiftc", "14.42.34433", "-Xswiftc", "-windows-sdk-version", "-Xswiftc", "10.0.22000.0"]
26+
}
27+
'@
28+
$Settings | Set-Content "$User_Directory\settings.json"
2129
$Process = Start-Process npm "run integration-test" -Wait -PassThru -NoNewWindow
2230
if ($Process.ExitCode -eq 0) {
2331
Write-Host 'SUCCESS'

0 commit comments

Comments
 (0)