Skip to content

Re-enable Windows CI for Swift 6.2.1 #1963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewbastien merged 4 commits into from
Dec 8, 2025
+2 −20
Merged

Re-enable Windows CI for Swift 6.2.1 #1963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3eed1c8
re-enable nightly Windows 6.2.1 CI
matthewbastien Nov 25, 2025
91fce50
re-enable LLDB contract test for Windows 6.2.1
matthewbastien Nov 25, 2025
60ef775
don't run npm install scripts twice on Windows
matthewbastien Dec 3, 2025
6fe981e
remove unnecessary environment update
matthewbastien Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/scripts/windows/setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@
. .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'
} else {
Write-Host ('FAILED ({0})' -f $Process.ExitCode)
exit 1
}

Get-Content $env:GITHUB_ENV | foreach {
$name, $value = $_.split('=')
Set-Content env:\$name $value
}
11 changes: 0 additions & 11 deletions test/integration-tests/debugger/lldb.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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,
Expand Down