Skip to content

Commit 8eefc33

Browse files
Re-enable Windows CI for Swift 6.2.1 (#1963)
1 parent a59a384 commit 8eefc33

File tree

4 files changed

+2
-20
lines changed

4 files changed

+2
-20
lines changed

.github/workflows/nightly.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,5 +114,3 @@ jobs:
114114
windows_pre_build_command: . .github\workflows\scripts\windows\setup.ps1
115115
windows_build_command: Invoke-Program scripts\test_windows.ps1
116116
enable_windows_docker: false
117-
# TODO re-enable when 6.2.1 toolchain working
118-
enable_windows_checks: false

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
6565
linux_build_command: ./scripts/test.sh
6666
# Windows
67-
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\"}]' }}"
67+
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\"}]' }}"
6868
windows_env_vars: |
6969
CI=1
7070
FAST_TEST_RUN=${{ contains(github.event.pull_request.labels.*.name, 'full-test-run') && '0' || '1'}}

.github/workflows/scripts/windows/setup.ps1

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
. .github\workflows\scripts\windows\install-nodejs.ps1
33

44
# Download the VSIX archived upstream
5-
npm ci
5+
npm ci --ignore-scripts
66
$Process = Start-Process npx "tsx scripts/download_vsix.ts" -Wait -PassThru -NoNewWindow
77
if ($Process.ExitCode -eq 0) {
88
Write-Host 'SUCCESS'
99
} else {
1010
Write-Host ('FAILED ({0})' -f $Process.ExitCode)
1111
exit 1
1212
}
13-
14-
Get-Content $env:GITHUB_ENV | foreach {
15-
$name, $value = $_.split('=')
16-
Set-Content env:\$name $value
17-
}

test/integration-tests/debugger/lldb.test.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { expect } from "chai";
1515

1616
import { WorkspaceContext } from "@src/WorkspaceContext";
1717
import { getLLDBLibPath } from "@src/debugger/lldb";
18-
import { Version } from "@src/utilities/version";
1918

2019
import { activateExtensionForTest } from "../utilities/testutilities";
2120

@@ -24,16 +23,6 @@ suite("lldb contract test suite", () => {
2423

2524
activateExtensionForTest({
2625
async setup(ctx) {
27-
// This test is failing due to toolchain issues starting with Swift 6.2.1
28-
// Will re-enable once that is resolved.
29-
//
30-
// https://github.com/swiftlang/vscode-swift/issues/1947
31-
if (
32-
process.platform === "win32" &&
33-
ctx.globalToolchainSwiftVersion.isGreaterThanOrEqual(new Version(6, 2, 1))
34-
) {
35-
this.skip();
36-
}
3726
workspaceContext = ctx;
3827
},
3928
requiresDebugger: true,

0 commit comments

Comments
 (0)