Browse Source

Try to use trusty fro travis

Laurent Destailleur 7 years ago
parent
commit
58fa42b347
2 changed files with 33 additions and 11 deletions
  1. 21 2
      .travis.yml
  2. 12 9
      build/travis-ci/apache.conf

+ 21 - 2
.travis.yml

@@ -3,7 +3,7 @@
 # For syntax, see http://about.travis-ci.org/docs/user/languages/php/
 
 # We use dist: precise to have php 5.3 available 
-dist: precise
+dist: trusty
 sudo: required
 
 language: php
@@ -140,7 +140,8 @@ install:
   echo "Adding path of binaries tools installed by composer to the PATH"
   export PATH="$TRAVIS_BUILD_DIR/htdocs/includes/bin:$PATH"
   echo
-  
+
+
 
 before_script:
 - |
@@ -149,6 +150,22 @@ before_script:
   echo Home dir is `echo ~`
   echo TRAVIS_BUILD_DIR is $TRAVIS_BUILD_DIR
 
+
+- sudo apt-get update
+- sudo apt-get install apache2 libapache2-mod-fastcgi
+# enable php-fpm
+- sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
+- sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
+- sudo a2enmod rewrite actions fastcgi alias
+- echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+- sudo sed -i -e "s,www-data,travis,g" /etc/apache2/envvars
+- sudo chown -R travis:travis /var/lib/apache2/fastcgi
+- ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
+# configure apache virtual hosts
+- sudo cp -f build/travis-ci/apache.conf /etc/apache2/sites-available/000-default.conf
+- sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
+- sudo service apache2 restart
+
 - |
   echo "Re-enabling Xdebug for PHP CodeSniffer and PHP Unit"
   phpenv config-add /tmp/xdebug.ini
@@ -265,6 +282,8 @@ before_script:
   sudo service apache2 restart
   echo
 
+
+
 script:
 - |
   echo "Checking webserver availability by a wget -O - http://127.0.0.1"

+ 12 - 9
build/travis-ci/apache.conf

@@ -1,18 +1,21 @@
 <VirtualHost *:80>
   DocumentRoot %TRAVIS_BUILD_DIR%/htdocs
 
-  <Directory "%TRAVIS_BUILD_DIR%/htdocs">
+  <Directory "%TRAVIS_BUILD_DIR%/htdocs/">
     Options FollowSymLinks MultiViews ExecCGI
     AllowOverride All
-    Order deny,allow
-    Allow from all
+    Require all granted
   </Directory>
 
   # Wire up Apache to use Travis CI's php-fpm.
-  #<IfModule mod_fastcgi.c>
-  #  AddHandler php5-fcgi .php
-  #  Action php5-fcgi /php5-fcgi
-  #  Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-  #  FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-  #</IfModule>
+  <IfModule mod_fastcgi.c>
+    AddHandler php5-fcgi .php
+    Action php5-fcgi /php5-fcgi
+    Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
+    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
+    
+    <Directory /usr/lib/cgi-bin>
+        Require all granted
+    </Directory>
+  </IfModule>
 </VirtualHost>