Skip to content

Commit 50c9811

Browse files
authored
Migrate vscode to @types/vscode and vscode-test (#607)
* Fix vulnerability Signed-off-by: Yan Zhang <yanzh@microsoft.com> * Migrate vscode to @types/vscode and vscode-test Signed-off-by: Yan Zhang <yanzh@microsoft.com> * remove unused script Signed-off-by: Yan Zhang <yanzh@microsoft.com> * fix launch.json Signed-off-by: Yan Zhang <yanzh@microsoft.com> * add logic to download depending extensions Signed-off-by: Yan Zhang <yanzh@microsoft.com> * Update vscode-test@1.0.1 to resolve extension installation issue Signed-off-by: Yan Zhang <yanzh@microsoft.com> * No longer depend on redhat.java Signed-off-by: Yan Zhang <yanzh@microsoft.com> * fix travis Signed-off-by: Yan Zhang <yanzh@microsoft.com> * fix travis Signed-off-by: Yan Zhang <yanzh@microsoft.com> * remove redhat.java Signed-off-by: Yan Zhang <yanzh@microsoft.com>
1 parent ea07ad3 commit 50c9811

File tree

10 files changed

+109
-643
lines changed

10 files changed

+109
-643
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ os:
88
- osx
99

1010
before_install:
11-
- if [ $TRAVIS_OS_NAME == "linux" ]; then
12-
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
13-
sh -e /etc/init.d/xvfb start;
14-
sleep 3;
15-
fi
16-
11+
- |
12+
if [ $TRAVIS_OS_NAME == "linux" ]; then
13+
export CXX="g++-4.9" CC="gcc-4.9"
14+
export DISPLAY=':99.0'
15+
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
16+
sleep 3
17+
fi
1718
install:
1819
- npm install -g vsce
1920
- npm install -g typescript
@@ -23,5 +24,4 @@ install:
2324
script:
2425
- gulp tslint
2526
- vsce package
26-
- npm run compile
27-
- npm test --silent
27+
- npm test

.vscode/launch.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,17 @@
1414
"preLaunchTask": "npm: watch"
1515
},
1616
{
17-
"name": "Launch Tests",
17+
"name": "Extension Tests",
1818
"type": "extensionHost",
1919
"request": "launch",
2020
"runtimeExecutable": "${execPath}",
21-
"args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ],
22-
"stopOnEntry": false,
21+
"args": [
22+
"--extensionDevelopmentPath=${workspaceFolder}",
23+
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
24+
],
2325
"sourceMaps": true,
24-
"outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],
26+
"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
2527
"preLaunchTask": "npm: compile"
26-
}
28+
}
2729
]
2830
}

0 commit comments

Comments
 (0)