Merge pull request #6 from chipitsine/master

agentzh · web-flow · commit 108b95153741 · 2016-11-10T08:44:57.000-08:00
travis-ci: added nginx-1.11.2 to build matrix, moved package management under "apt" plugin.
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,7 @@ cache:
 
 addons:
   apt:
-    packages:
-    - mysql-server
+    packages: [ mysql-server, axel, cpanminus, libtest-base-perl, libtext-diff-perl, liburi-perl, libwww-perl, libtest-longstring-perl, liblist-moreutils-perl ]
 
 compiler:
   - gcc
@@ -31,16 +30,13 @@ env:
     - TEST_NGINX_SLEEP=0.006
   matrix:
     - NGINX_VERSION=1.9.15
+    - NGINX_VERSION=1.11.2
 
 services:
  - postgresql
 
-before_install:
-  - sudo apt-get install -qq -y axel cpanminus libtest-base-perl libtext-diff-perl liburi-perl libwww-perl libtest-longstring-perl liblist-moreutils-perl > build.log 2>&1 || (cat build.log && exit 1)
-
 install:
-  - if [ ! -d download-cache ]; then mkdir download-cache; fi
-  - if [ ! -f download-cache/drizzle7-2011.07.21.tar.gz ]; then wget -O download-cache/drizzle7-2011.07.21.tar.gz http://openresty.org/download/drizzle7-2011.07.21.tar.gz; fi
+  - if [ ! -f download-cache/drizzle7-2011.07.21.tar.gz ]; then wget -P download-cache/ http://openresty.org/download/drizzle7-2011.07.21.tar.gz; fi
   - git clone https://github.com/openresty/nginx-devel-utils.git
   - git clone https://github.com/openresty/openresty.git ../openresty
   - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
