Commit 1b14a5f9 1b14a5f9f2d3e8a012b3d89421eb4855b262c0e2 by Matt DuVall

Merge pull request #669 from hexid/refactor-travis

Refactor Travis config
2 parents 3fe4629b 670362b0
...@@ -8,3 +8,4 @@ tests/testdir/** ...@@ -8,3 +8,4 @@ tests/testdir/**
8 tmp 8 tmp
9 ./*.js 9 ./*.js
10 ./phantomjs*/* 10 ./phantomjs*/*
11 ./engine/*
......
...@@ -3,38 +3,21 @@ branches: ...@@ -3,38 +3,21 @@ branches:
3 - "master" 3 - "master"
4 4
5 before_install: 5 before_install:
6 - echo "installing PhantomJS 1.8.2" 6 - if [[ $ENGINE == 'phantomjs' ]]; then export ENGINE_DOWNLOAD='http://phantomjs.googlecode.com/files'; fi
7 - wget http://phantomjs.googlecode.com/files/phantomjs-1.8.2-linux-x86_64.tar.bz2 7 - if [[ $ENGINE == 'slimerjs' ]]; then export ENGINE_DOWNLOAD='http://download.slimerjs.org/v0.8'; fi
8 - tar -xvf phantomjs-1.8.2-linux-x86_64.tar.bz2 8
9 - sudo mv phantomjs-1.8.2-linux-x86_64/bin/phantomjs bin/phantomjs182 9 - echo "Installing $ENGINE $ENGINE_VERSION"
10 - ls -la bin/phantomjs182 10 - wget $(echo $ENGINE_DOWNLOAD)/$(echo $ENGINE)-$(echo $ENGINE_VERSION)-linux-x86_64.tar.bz2 --output-document=engine.tar.bz2
11 - bin/phantomjs182 --version 11 - mkdir engine && tar --strip-components=1 -xvf engine.tar.bz2 -C engine
12 - echo "installing PhantomJS 1.9.0" 12
13 - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.0-linux-x86_64.tar.bz2 13 - if [[ $ENGINE == 'phantomjs' ]]; then ls -la engine/bin/phantomjs && engine/bin/phantomjs --version; fi
14 - tar -xvf phantomjs-1.9.0-linux-x86_64.tar.bz2 14 - if [[ $ENGINE == 'slimerjs' ]]; then ls -la engine/slimerjs && engine/slimerjs --version; fi
15 - sudo mv phantomjs-1.9.0-linux-x86_64/bin/phantomjs bin/phantomjs190 15
16 - bin/phantomjs190 --version 16 install:
17 - ls -la bin/phantomjs190
18 - echo "installing PhantomJS 1.9.1"
19 - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2
20 - tar -xvf phantomjs-1.9.1-linux-x86_64.tar.bz2
21 - sudo mv phantomjs-1.9.1-linux-x86_64/bin/phantomjs bin/phantomjs191
22 - bin/phantomjs191 --version
23 - ls -la bin/phantomjs191
24 - echo "installing PhantomJS 1.9.2"
25 - wget http://phantomjs.googlecode.com/files/phantomjs-1.9.2-linux-x86_64.tar.bz2
26 - tar -xvf phantomjs-1.9.2-linux-x86_64.tar.bz2
27 - sudo mv phantomjs-1.9.2-linux-x86_64/bin/phantomjs bin/phantomjs192
28 - bin/phantomjs192 --version
29 - ls -la bin/phantomjs192
30 - sudo apt-get install -qq mono-devel mono-mcs 17 - sudo apt-get install -qq mono-devel mono-mcs
31 18
32 before_script: 19 before_script:
33 - "npm install -g jshint@2.0.1" 20 - "npm install -g jshint@2.0.1"
34 - bin/phantomjs182 --version
35 - bin/phantomjs190 --version
36 - bin/phantomjs191 --version
37 - bin/phantomjs192 --version
38 21
39 script: 22 script:
40 - make test 23 - make test
...@@ -42,10 +25,13 @@ script: ...@@ -42,10 +25,13 @@ script:
42 25
43 env: 26 env:
44 matrix: 27 matrix:
45 - PHANTOMJS_EXECUTABLE="bin/phantomjs182 --local-to-remote-url-access=yes --ignore-ssl-errors=yes" 28 - ENGINE="phantomjs" ENGINE_VERSION="1.8.2"
46 - PHANTOMJS_EXECUTABLE="bin/phantomjs190 --local-to-remote-url-access=yes --ignore-ssl-errors=yes" 29 - ENGINE="phantomjs" ENGINE_VERSION="1.9.0"
47 - PHANTOMJS_EXECUTABLE="bin/phantomjs191 --local-to-remote-url-access=yes --ignore-ssl-errors=yes" 30 - ENGINE="phantomjs" ENGINE_VERSION="1.9.1"
48 - PHANTOMJS_EXECUTABLE="bin/phantomjs192 --local-to-remote-url-access=yes --ignore-ssl-errors=yes" 31 - ENGINE="phantomjs" ENGINE_VERSION="1.9.2"
32 global:
33 - PHANTOMJS_EXECUTABLE="engine/bin/phantomjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
34 - SLIMERJS_EXECUTABLE="engine/slimerjs --local-to-remote-url-access=yes --ignore-ssl-errors=yes"
49 35
50 notifications: 36 notifications:
51 irc: 37 irc:
......