mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-02-05 16:38:05 -06:00
Disable node6 build
This commit is contained in:
parent
7ca84aca52
commit
9e6cd166c1
@ -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:
|
||||
|
||||
64
Jakefile.js
64
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"]);
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 ->
|
||||
|
||||
|
||||
@ -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",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user