File tree 2 files changed +20
-6
lines changed
2 files changed +20
-6
lines changed Original file line number Diff line number Diff line change 52
52
NVM_DIR=/usr/local/nvm
53
53
CI=1
54
54
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
55
- VSCODE_SWIFT_VSIX=${{github.workspace}}\ vscode-swift.vsix
55
+ VSCODE_SWIFT_VSIX=vscode-swift.vsix
56
56
GITHUB_TOKEN=${{github.token}}
57
57
GITHUB_REPOSITORY=${{github.repository}}
58
58
linux_pre_build_command : . .github/workflows/scripts/setup-linux.sh
62
62
CI=1
63
63
VSCODE_TEST=1
64
64
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
65
- VSCODE_SWIFT_VSIX=${{github.workspace}}\ vscode-swift.vsix
65
+ VSCODE_SWIFT_VSIX=vscode-swift.vsix
66
66
GITHUB_TOKEN=${{github.token}}
67
67
GITHUB_REPOSITORY=${{github.repository}}
68
68
windows_pre_build_command : .github\workflows\scripts\windows\setup.ps1
84
84
VSCODE_TEST=1
85
85
VSCODE_VERSION=insiders
86
86
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
87
- VSCODE_SWIFT_VSIX=${{github.workspace}}\ vscode-swift.vsix
87
+ VSCODE_SWIFT_VSIX=vscode-swift.vsix
88
88
GITHUB_TOKEN=${{github.token}}
89
89
GITHUB_REPOSITORY=${{github.repository}}
90
90
linux_pre_build_command : . .github/workflows/scripts/setup-linux.sh
96
96
VSCODE_TEST=1
97
97
VSCODE_VERSION=insiders
98
98
VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
99
- VSCODE_SWIFT_VSIX=${{github.workspace}}\ vscode-swift.vsix
99
+ VSCODE_SWIFT_VSIX=vscode-swift.vsix
100
100
GITHUB_TOKEN=${{github.token}}
101
101
GITHUB_REPOSITORY=${{github.repository}}
102
102
windows_pre_build_command : .github\workflows\scripts\windows\setup.ps1
Original file line number Diff line number Diff line change @@ -25,10 +25,25 @@ const isDebugRun = !(process.env["_"] ?? "").endsWith("node_modules/.bin/vscode-
25
25
// so tests don't timeout when a breakpoint is hit
26
26
const timeout = isDebugRun ? Number . MAX_SAFE_INTEGER : 3000 ;
27
27
28
- const vsixPath = process . env [ "VSCODE_SWIFT_VSIX" ] ;
28
+ let vsixPath = process . env [ "VSCODE_SWIFT_VSIX" ] ;
29
+ const install = [ ] ;
30
+ if ( vsixPath ) {
31
+ if ( ! path . isAbsolute ( vsixPath ) ) {
32
+ vsixPath = path . join ( __dirname , vsixPath ) ;
33
+ }
34
+ console . log ( "Installing " + vsixPath ) ;
35
+ install . push ( {
36
+ label : "installExtension" ,
37
+ installExtensions : vsixPath ? [ vsixPath ] : [ ] ,
38
+ files : [ ] ,
39
+ version : process . env [ "VSCODE_VERSION" ] ?? "stable" ,
40
+ reuseMachineInstall : ! isCIBuild ,
41
+ } ) ;
42
+ }
29
43
30
44
module . exports = defineConfig ( {
31
45
tests : [
46
+ ...install ,
32
47
{
33
48
label : "integrationTests" ,
34
49
files : [ "dist/test/common.js" , "dist/test/integration-tests/**/*.test.js" ] ,
@@ -59,7 +74,6 @@ module.exports = defineConfig({
59
74
} ,
60
75
} ,
61
76
reuseMachineInstall : ! isCIBuild ,
62
- installExtensions : [ "vadimcn.vscode-lldb" ] . concat ( vsixPath ? [ vsixPath ] : [ ] ) ,
63
77
} ,
64
78
{
65
79
label : "unitTests" ,
You can’t perform that action at this time.
0 commit comments