Skip to content

Commit 978e773

Browse files
authored
chore(travis): cleanup travis.yml (angular#1479)
1 parent 2971169 commit 978e773

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

.travis.yml

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,42 @@
11
dist: trusty
22
sudo: required
3+
language: node_js
4+
node_js:
5+
- "5"
6+
- "6"
7+
os:
8+
- linux
9+
- osx
310
env:
411
global:
512
- DBUS_SESSION_BUS_ADDRESS=/dev/null
613
matrix:
7-
- NODE_VERSION=5 SCRIPT=lint
8-
- NODE_VERSION=5 SCRIPT=test
9-
- NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test
10-
- NODE_VERSION=6 SCRIPT=test
11-
- NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test
12-
os:
13-
- linux
14-
- osx
14+
- SCRIPT=lint
15+
- SCRIPT=test
16+
- TARGET=mobile SCRIPT=mobile_test
1517
matrix:
1618
exclude:
19+
- node_js: "6"
20+
env: SCRIPT=lint
1721
- os: osx
18-
env: NODE_VERSION=5 SCRIPT=lint
22+
node_js: "5"
23+
env: SCRIPT=lint
1924
- os: osx
20-
env: NODE_VERSION=5 TARGET=mobile SCRIPT=mobile_test
21-
- os: osx
22-
env: NODE_VERSION=6 TARGET=mobile SCRIPT=mobile_test
23-
24-
script:
25-
- npm run-script $SCRIPT
25+
env: TARGET=mobile SCRIPT=mobile_test
2626

2727
before_install:
28-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.1/install.sh | bash; fi
29-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ~/.nvm/nvm-exec; fi
3028
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
3129
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew tap caskroom/cask; fi
3230
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask install google-chrome --force; fi
3331
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export DISPLAY=:99.0; fi
3432
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
3533
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CHROME_BIN=chromium-browser; fi
3634
- if [[ "$TARGET" == "mobile" ]]; then export MOBILE_TEST=true; fi
37-
- nvm install $NODE_VERSION
3835
- npm config set spin false
3936
- npm config set progress false
37+
4038
install:
41-
- node --version
42-
- npm --version
43-
- git --version
4439
- npm install --no-optional
40+
41+
script:
42+
- npm run-script $SCRIPT

0 commit comments

Comments
 (0)