diff --git a/build/build.yml b/build/build.yml index dcbf499f8..1912b86bd 100644 --- a/build/build.yml +++ b/build/build.yml @@ -39,11 +39,6 @@ steps: verbose: false customCommand: 'install -g gulp-cli' -- task: Gulp@0 - displayName: 'gulp install' - inputs: - targets: install - - bash: | export BUILDMACHINE=true export VsMsSqlEnv=dev diff --git a/gulpfile.js b/gulpfile.js index 30877500a..3c588144e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,5 @@ var gulp = require('gulp'); var rename = require('gulp-rename'); -var install = require('gulp-install'); var gulpTsLint = require('gulp-tslint'); var ts = require('gulp-typescript'); var tslint = require('tslint'); @@ -238,7 +237,7 @@ gulp.task('ext:localization', gulp.series('ext:localization:xliff-to-ts', 'ext:l gulp.task('ext:build', gulp.series('ext:localization', 'ext:copy', 'ext:clean-library-ts-files', 'ext:compile', 'ext:compile-view')); // removed lint before copy -gulp.task('ext:test', async () => { +gulp.task('ext:test', (done) => { let workspace = process.env['WORKSPACE']; if (!workspace) { workspace = process.cwd(); @@ -246,21 +245,22 @@ gulp.task('ext:test', async () => { process.env.JUNIT_REPORT_PATH = workspace + '/test-reports/ext_xunit.xml'; var args = ['--verbose', '--disable-gpu', '--disable-telemetry', '--disable-updates', '-n']; let vscodeVersion = packageJson.engines.vscode.slice(1); - let vscodePath = await vscodeTest.downloadAndUnzipVSCode(vscodeVersion); let extensionTestsPath = `${workspace}/out/test`; - try { - await vscodeTest.runTests({ - vscodeExecutablePath: vscodePath, - extensionDevelopmentPath: workspace, - extensionTestsPath: extensionTestsPath, - launchArgs: args - }); - } catch (error) { - console.log(`stdout: ${stdout}`); - console.log(`stderr: ${stderr}`); - console.error(`exec error: ${error}`); - throw(error); - } + vscodeTest.downloadAndUnzipVSCode(vscodeVersion).then((vscodePath) => { + if (vscodePath) { + vscodeTest.runTests({ + vscodeExecutablePath: vscodePath, + extensionDevelopmentPath: workspace, + extensionTestsPath: extensionTestsPath, + launchArgs: args + }).then(() => done()).catch((error) => { + console.log(`stdout: ${process.stdout}`); + console.log(`stderr: ${process.stderr}`); + console.error(`exec error: ${error}`); + throw(error); + }); + } + }) }); gulp.task('test', gulp.series('ext:test')); @@ -273,13 +273,8 @@ gulp.task('clean', function (done) { gulp.task('build', gulp.series('clean', 'ext:build', 'ext:install-service')); -gulp.task('install', function() { - return gulp.src(['./package.json']) - .pipe(install()); -}); - gulp.task('watch', function(){ return gulp.watch(config.paths.project.root + '/src/**/*', gulp.series('build')) }); -// gulp.task('lint', gulp.series('ext:lint')); +gulp.task('lint', gulp.series('ext:lint')); diff --git a/install.js b/install.js deleted file mode 100644 index 41e4d5328..000000000 --- a/install.js +++ /dev/null @@ -1,7 +0,0 @@ -var gulp = require('gulp'); -var install = require('gulp-install'); - -gulp.task('install', function(){ - return gulp.src(['./package.json']) - .pipe(install()); -}); \ No newline at end of file diff --git a/package.json b/package.json index b73e0d440..440316dfd 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@types/mocha": "^5.2.7", "@types/tmp": "0.0.28", "@types/underscore": "1.8.3", - "@types/vscode": "^1.1.33", + "@types/vscode": "^1.38.0", "assert": "^1.4.1", "chai": "^3.5.0", "copy-paste": "^1.3.0", @@ -84,7 +84,6 @@ "del": "^2.2.1", "gulp": "github:gulpjs/gulp#v4.0.0", "gulp-concat": "^2.6.0", - "gulp-install": "^0.6.0", "gulp-istanbul-report": "0.0.1", "gulp-json-editor": "^2.2.1", "gulp-rename": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 4193f5ae1..e36cb5e9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,7 +120,7 @@ resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.8.3.tgz#d3cb512dd3dde32b2bbba4be0ca68bd3dad4a1f5" integrity sha512-DP70788BXjp9+CKArXOUlNkZaXa+rHonDpbqH3/74ez16dLL5z2/bMT37etbln5J+H9M07NbRUyduDIoTM2tnw== -"@types/vscode@^1.1.33": +"@types/vscode@^1.38.0": version "1.41.0" resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.41.0.tgz#b0d75920220f84e07093285e59180c0f11d336cd" integrity sha512-7SfeY5u9jgiELwxyLB3z7l6l/GbN9CqpCQGkcRlB7tKRFBxzbz2PoBfGrLxI1vRfUCIq5+hg5vtDHExwq5j3+A== @@ -2497,15 +2497,6 @@ gulp-concat@^2.6.0: through2 "^2.0.0" vinyl "^2.0.0" -gulp-install@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/gulp-install/-/gulp-install-0.6.0.tgz#11541f11fc5f7a19e18cb3ef8eadb9e64b8e54aa" - integrity sha1-EVQfEfxfehnhjLPvjq255kuOVKo= - dependencies: - gulp-util "^3.0.4" - through2 "^2.0.0" - which "^1.0.9" - gulp-istanbul-report@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/gulp-istanbul-report/-/gulp-istanbul-report-0.0.1.tgz#e6c6588e4b030f611a6bd9382ca5a2380170de4f" @@ -2630,7 +2621,7 @@ gulp-util@3.0.7: through2 "^2.0.0" vinyl "^0.5.0" -gulp-util@^3.0.1, gulp-util@^3.0.4, gulp-util@^3.0.7, gulp-util@~3.0.7: +gulp-util@^3.0.1, gulp-util@^3.0.7, gulp-util@~3.0.7: version "3.0.8" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08= @@ -6124,7 +6115,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1.3.1, which@^1.0.9, which@^1.1.1, which@^1.2.14: +which@1.3.1, which@^1.1.1, which@^1.2.14: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==