Disable node6 build

This commit is contained in:
Ron Buckton 2018-01-29 12:31:07 -08:00
parent 7ca84aca52
commit 9e6cd166c1
5 changed files with 22 additions and 61 deletions

View File

@ -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:

View File

@ -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"]);

View File

@ -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

View File

@ -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 ->

View File

@ -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",