From 375946e93af0792995b4206493ba71d5330d9663 Mon Sep 17 00:00:00 2001 From: Julio Date: Tue, 5 Jun 2018 11:33:01 +0200 Subject: [PATCH] Minor - improve travis speed + change memory limit --- .travis.yml | 7 +------ tests/travis/setup-php-fpm.sh | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63dd7fd6ff..98ceff6904 100755 --- a/.travis.yml +++ b/.travis.yml @@ -66,11 +66,6 @@ before_install: - php -v - php -ini | grep memory_limit - sudo cat /etc/hosts - - phpenv config-add tests/travis/php-config.ini - # Remove xdebug - - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" - - php -ini | grep memory_limit - - php -v # Install Chash, a database, and then install Chamilo - git clone https://github.com/chamilo/chash @@ -98,7 +93,7 @@ before_install: - sudo chown -R 775 $TRAVIS_BUILD_DIR - sudo chmod +x /home/travis/build - sudo service apache2 restart - - curl $VHOST_URL + #- curl $VHOST_URL script: - whereis google-chrome-stable diff --git a/tests/travis/setup-php-fpm.sh b/tests/travis/setup-php-fpm.sh index 0718a564e7..dcb11e147e 100644 --- a/tests/travis/setup-php-fpm.sh +++ b/tests/travis/setup-php-fpm.sh @@ -18,7 +18,7 @@ sudo sed -e "s?;error_log = log/php-fpm.log?error_log = /var/log/php-fpm.log?g" echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini echo "error_log = /var/log/php-fpm.log" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini -echo "memory_limit = 2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini +echo "memory_limit = 4G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini # Starting PHP FPM ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm