Skip to content

Commit 360274f

Browse files
filipesilvaDanny Blue
authored and
Danny Blue
committed
chore(ci): use node 4 instead of 5 (angular#2469)
1 parent 32c5feb commit 360274f

File tree

2 files changed

+27
-18
lines changed

2 files changed

+27
-18
lines changed

.appveyor.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
environment:
22
matrix:
3-
- nodejs_version: "5.0"
3+
- nodejs_version: "4.0"
44
- nodejs_version: "6.0"
55

66
matrix:
77
fast_finish: true
88

99
install:
1010
- ps: Install-Product node $env:nodejs_version
11+
- npm install -g npm
1112
- npm install
1213

1314
test_script:

.travis.yml

+25-17
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ dist: trusty
22
sudo: required
33
language: node_js
44
node_js:
5-
- "5"
6-
- "6"
5+
- "4"
76
os:
87
- linux
9-
- osx
108
env:
119
global:
1210
- DBUS_SESSION_BUS_ADDRESS=/dev/null
@@ -20,25 +18,34 @@ env:
2018
matrix:
2119
fast_finish: true
2220
allow_failures:
21+
- node_js: "5"
2322
- os: osx
2423
- env: NODE_SCRIPT="tests/e2e_runner.js --nightly"
25-
exclude:
24+
include:
25+
- node_js: "5"
26+
os: linux
27+
env: SCRIPT=test
28+
- node_js: "5"
29+
os: linux
30+
env: NODE_SCRIPT=tests/e2e_runner.js
2631
- node_js: "6"
27-
env: SCRIPT=lint
28-
- os: osx
29-
env: NODE_SCRIPT="tests/e2e_runner.js --nightly"
32+
os: linux
33+
env: SCRIPT=test
3034
- node_js: "6"
31-
env: NODE_SCRIPT="tests/e2e_runner.js --nightly"
32-
- os: osx
33-
node_js: "5"
34-
env: SCRIPT=lint
35+
os: linux
36+
env: NODE_SCRIPT=tests/e2e_runner.js
37+
- node_js: "4"
38+
os: osx
39+
env: SCRIPT=test
40+
- node_js: "4"
41+
os: osx
42+
env: NODE_SCRIPT=tests/e2e_runner.js
3543
- node_js: "6"
36-
env: SCRIPT=build
37-
- os: osx
38-
node_js: "5"
39-
env: SCRIPT=build
40-
- os: osx
41-
env: TARGET=mobile SCRIPT=mobile_test
44+
os: osx
45+
env: SCRIPT=test
46+
- node_js: "6"
47+
os: osx
48+
env: NODE_SCRIPT=tests/e2e_runner.js
4249

4350
before_install:
4451
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@@ -50,6 +57,7 @@ before_install:
5057
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi
5158
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "--no-sandbox" > ~/.config/chromium-flags.conf; fi
5259
- if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi
60+
- npm install -g npm
5361
- npm config set spin false
5462
- npm config set progress false
5563

0 commit comments

Comments
 (0)