Skip to content

Commit f527a15

Browse files
committed
Disable node6 build
1 parent 7ca84ac commit f527a15

File tree

5 files changed

+22
-61
lines changed

5 files changed

+22
-61
lines changed

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ language: node_js
22

33
node_js:
44
- 'stable'
5-
- '8'
6-
- '6'
5+
- 'lts/*'
76

87
sudo: false
98

@@ -24,11 +23,6 @@ install:
2423
- npm uninstall typescript --no-save
2524
- npm uninstall tslint --no-save
2625
- npm install
27-
- if [ "$TRAVIS_NODE_VERSION" = "6" ]; then
28-
npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save;
29-
npm run build:private-packages;
30-
npm install file:scripts/typemock file:scripts/vfs-errors file:scripts/vfs-core file:scripts/vfs-path file:scripts/vfs --no-save;
31-
fi
3226

3327
cache:
3428
directories:

Jakefile.js

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -843,53 +843,29 @@ task("vfs-errors", function () {
843843
}, { async: true });
844844

845845
task("vfs-path", ["vfs-core", "vfs-errors"], function () {
846-
if (process.env.INSTALL_PRIVATE_DEPS) {
847-
execNpmInstall(["file:scripts/vfs-core", "file:scripts/vfs-errors"], function (error) {
848-
if (error) return fail(error);
849-
compile();
850-
});
851-
}
852-
else {
853-
compile();
854-
}
855-
856-
function compile() {
857-
var startCompileTime = mark();
858-
execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-path/tsconfig.json"], function (error) {
859-
if (error) {
860-
fail("Compilation unsuccessful.");
861-
}
862-
else {
863-
complete();
864-
}
865-
measure(startCompileTime);
866-
});
867-
}
846+
var startCompileTime = mark();
847+
execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-path/tsconfig.json"], function (error) {
848+
if (error) {
849+
fail("Compilation unsuccessful.");
850+
}
851+
else {
852+
complete();
853+
}
854+
measure(startCompileTime);
855+
});
868856
}, { async: true });
869857

870858
task("vfs", ["vfs-core", "vfs-errors", "vfs-path", "typemock"], function () {
871-
if (process.env.INSTALL_PRIVATE_DEPS) {
872-
execNpmInstall(["file:scripts/vfs-path", "file:scripts/typemock"], function (error) {
873-
if (error) return fail(error);
874-
compile();
875-
});
876-
}
877-
else {
878-
compile();
879-
}
880-
881-
function compile() {
882-
var startCompileTime = mark();
883-
execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs/tsconfig.json"], function (error) {
884-
if (error) {
885-
fail("Compilation unsuccessful.");
886-
}
887-
else {
888-
complete();
889-
}
890-
measure(startCompileTime);
891-
});
892-
}
859+
var startCompileTime = mark();
860+
execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs/tsconfig.json"], function (error) {
861+
if (error) {
862+
fail("Compilation unsuccessful.");
863+
}
864+
else {
865+
complete();
866+
}
867+
measure(startCompileTime);
868+
});
893869
}, { async: true });
894870

895871
task("private-packages", ["typemock", "vfs"]);

jenkins.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,5 @@ nvm install $1
99
npm uninstall typescript --no-save
1010
npm uninstall tslint --no-save
1111
npm install
12-
13-
# Node 6 uses an older version of npm that does not symlink a package with a "file:" reference
14-
if [ "$1" = "6" ]; then
15-
npm uninstall typemock @typescript/vfs @typescript/vfs-path @typescript/vfs-core @typescript/vfs-errors --no-save;
16-
npm run build:private-packages;
17-
npm install file:scripts/typemock file:scripts/vfs-errors file:scripts/vfs-core file:scripts/vfs-path file:scripts/vfs --no-save;
18-
fi
19-
2012
npm update
2113
npm test

netci.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import jobs.generation.Utilities;
55
def project = GithubProject
66
def branch = GithubBranchName
77

8-
def nodeVersions = ['stable', '8', '6']
8+
def nodeVersions = ['stable', '8']
99

1010
nodeVersions.each { nodeVer ->
1111

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393
"build": "npm run build:compiler && npm run build:tests",
9494
"build:compiler": "jake local",
9595
"build:tests": "jake tests",
96-
"build:private-packages": "jake private-packages INSTALL_PRIVATE_DEPS=1",
9796
"start": "node lib/tsc",
9897
"clean": "jake clean",
9998
"gulp": "gulp",

0 commit comments

Comments
 (0)