From 3eed1c84ecfb7135f3a8155176b5e4327ae5fb37 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Tue, 25 Nov 2025 14:42:16 -0500 Subject: [PATCH 1/4] re-enable nightly Windows 6.2.1 CI --- .github/workflows/nightly.yml | 2 -- .github/workflows/pull_request.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5636cb468..a434ef834 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -114,5 +114,3 @@ jobs: windows_pre_build_command: . .github\workflows\scripts\windows\setup.ps1 windows_build_command: Invoke-Program scripts\test_windows.ps1 enable_windows_docker: false - # TODO re-enable when 6.2.1 toolchain working - enable_windows_checks: false diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index dc40a62fc..00b679852 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -64,7 +64,7 @@ jobs: linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh linux_build_command: ./scripts/test.sh # Windows - windows_exclude_swift_versions: "${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '[{\"swift_version\": \"nightly-6.1\"},{\"swift_version\": \"nightly\"},{\"swift_version\": \"6.2\"}]' || '[{\"swift_version\": \"nightly-6.1\"},{\"swift_version\": \"nightly-6.2\"},{\"swift_version\": \"nightly\"}]' }}" + windows_exclude_swift_versions: "${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '[{\"swift_version\": \"nightly-6.1\"},{\"swift_version\": \"nightly\"}]' || '[{\"swift_version\": \"nightly-6.1\"},{\"swift_version\": \"nightly-6.2\"},{\"swift_version\": \"nightly\"}]' }}" windows_env_vars: | CI=1 FAST_TEST_RUN=${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '0' || '1'}} From 91fce50e14a3387dcb1e39d6e4ff9142ae883c81 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Tue, 25 Nov 2025 14:43:59 -0500 Subject: [PATCH 2/4] re-enable LLDB contract test for Windows 6.2.1 --- test/integration-tests/debugger/lldb.test.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/integration-tests/debugger/lldb.test.ts b/test/integration-tests/debugger/lldb.test.ts index 7503333a3..bc993fb62 100644 --- a/test/integration-tests/debugger/lldb.test.ts +++ b/test/integration-tests/debugger/lldb.test.ts @@ -15,7 +15,6 @@ import { expect } from "chai"; import { WorkspaceContext } from "@src/WorkspaceContext"; import { getLLDBLibPath } from "@src/debugger/lldb"; -import { Version } from "@src/utilities/version"; import { activateExtensionForTest } from "../utilities/testutilities"; @@ -24,16 +23,6 @@ suite("lldb contract test suite", () => { activateExtensionForTest({ async setup(ctx) { - // This test is failing due to toolchain issues starting with Swift 6.2.1 - // Will re-enable once that is resolved. - // - // https://github.com/swiftlang/vscode-swift/issues/1947 - if ( - process.platform === "win32" && - ctx.globalToolchainSwiftVersion.isGreaterThanOrEqual(new Version(6, 2, 1)) - ) { - this.skip(); - } workspaceContext = ctx; }, requiresDebugger: true, From 60ef775e050048f628c72e6df418df4bdb963d6e Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Wed, 3 Dec 2025 17:04:04 -0500 Subject: [PATCH 3/4] don't run npm install scripts twice on Windows --- .github/workflows/scripts/windows/setup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/windows/setup.ps1 b/.github/workflows/scripts/windows/setup.ps1 index 3404632ee..8c2b546ca 100644 --- a/.github/workflows/scripts/windows/setup.ps1 +++ b/.github/workflows/scripts/windows/setup.ps1 @@ -2,7 +2,7 @@ . .github\workflows\scripts\windows\install-nodejs.ps1 # Download the VSIX archived upstream -npm ci +npm ci --ignore-scripts $Process = Start-Process npx "tsx scripts/download_vsix.ts" -Wait -PassThru -NoNewWindow if ($Process.ExitCode -eq 0) { Write-Host 'SUCCESS' From 6fe981eb5af3abc4fa7bfed2450d1d9f8a8b7d69 Mon Sep 17 00:00:00 2001 From: Matthew Bastien Date: Wed, 3 Dec 2025 19:13:29 -0500 Subject: [PATCH 4/4] remove unnecessary environment update --- .github/workflows/scripts/windows/setup.ps1 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/scripts/windows/setup.ps1 b/.github/workflows/scripts/windows/setup.ps1 index 8c2b546ca..ec6ffe5a9 100644 --- a/.github/workflows/scripts/windows/setup.ps1 +++ b/.github/workflows/scripts/windows/setup.ps1 @@ -10,8 +10,3 @@ if ($Process.ExitCode -eq 0) { Write-Host ('FAILED ({0})' -f $Process.ExitCode) exit 1 } - -Get-Content $env:GITHUB_ENV | foreach { - $name, $value = $_.split('=') - Set-Content env:\$name $value -}