diff --git a/.travis.yml b/.travis.yml index 8b924a336fe..8ba280a814e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ language: node_js node_js: - 'stable' - - '8' - - '6' + - 'lts/*' sudo: false @@ -24,11 +23,6 @@ install: - npm uninstall typescript --no-save - npm uninstall tslint --no-save - npm install - - if [ "$TRAVIS_NODE_VERSION" = "6" ]; then - npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; - npm run build:private-packages; - npm install file:scripts/typemock file:scripts/vfs-errors file:scripts/vfs-core file:scripts/vfs-path file:scripts/vfs --no-save; - fi cache: directories: diff --git a/Jakefile.js b/Jakefile.js index 2e29eac9381..aff71dc7be3 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -843,53 +843,29 @@ task("vfs-errors", function () { }, { async: true }); task("vfs-path", ["vfs-core", "vfs-errors"], function () { - if (process.env.INSTALL_PRIVATE_DEPS) { - execNpmInstall(["file:scripts/vfs-core", "file:scripts/vfs-errors"], function (error) { - if (error) return fail(error); - compile(); - }); - } - else { - compile(); - } - - function compile() { - var startCompileTime = mark(); - execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-path/tsconfig.json"], function (error) { - if (error) { - fail("Compilation unsuccessful."); - } - else { - complete(); - } - measure(startCompileTime); - }); - } + var startCompileTime = mark(); + execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-path/tsconfig.json"], function (error) { + if (error) { + fail("Compilation unsuccessful."); + } + else { + complete(); + } + measure(startCompileTime); + }); }, { async: true }); task("vfs", ["vfs-core", "vfs-errors", "vfs-path", "typemock"], function () { - if (process.env.INSTALL_PRIVATE_DEPS) { - execNpmInstall(["file:scripts/vfs-path", "file:scripts/typemock"], function (error) { - if (error) return fail(error); - compile(); - }); - } - else { - compile(); - } - - function compile() { - var startCompileTime = mark(); - execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs/tsconfig.json"], function (error) { - if (error) { - fail("Compilation unsuccessful."); - } - else { - complete(); - } - measure(startCompileTime); - }); - } + var startCompileTime = mark(); + execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs/tsconfig.json"], function (error) { + if (error) { + fail("Compilation unsuccessful."); + } + else { + complete(); + } + measure(startCompileTime); + }); }, { async: true }); task("private-packages", ["typemock", "vfs"]); diff --git a/jenkins.sh b/jenkins.sh index fe1a88fbbe0..b716f5bbeb2 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -9,13 +9,5 @@ nvm install $1 npm uninstall typescript --no-save npm uninstall tslint --no-save npm install - -# Node 6 uses an older version of npm that does not symlink a package with a "file:" reference -if [ "$1" = "6" ]; then - npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save; - npm run build:private-packages; - npm install file:scripts/typemock file:scripts/vfs-errors file:scripts/vfs-core file:scripts/vfs-path file:scripts/vfs --no-save; -fi - npm update npm test diff --git a/netci.groovy b/netci.groovy index 5fa8b02baf2..e40d3a7e0ff 100644 --- a/netci.groovy +++ b/netci.groovy @@ -5,7 +5,7 @@ import jobs.generation.Utilities; def project = GithubProject def branch = GithubBranchName -def nodeVersions = ['stable', '8', '6'] +def nodeVersions = ['stable', '8'] nodeVersions.each { nodeVer -> diff --git a/package.json b/package.json index aadb578a6de..980f17dd529 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,6 @@ "build": "npm run build:compiler && npm run build:tests", "build:compiler": "jake local", "build:tests": "jake tests", - "build:private-packages": "jake private-packages INSTALL_PRIVATE_DEPS=1", "start": "node lib/tsc", "clean": "jake clean", "gulp": "gulp",