From 3ce375810da93d98e8e791f07c843f94ecabe8d9 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sat, 1 Jul 2017 00:16:47 +0100 Subject: [PATCH] try to fix travis --- .travis.yml | 4 ++-- test/ci/travis/setup_apache.sh | 2 +- test/ci/travis/setup_apache_hhvm.sh | 2 +- test/ci/travis/setup_privoxy.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6df5756..4950722 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,8 @@ before_script: # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against - - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./tests/ci/travis/setup_php_fpm.sh; ./tests/ci/travis/setup_apache.sh; fi - - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./tests/ci/travis/setup_hhvm.sh; ./tests/ci/travis/setup_apache_hhvm.sh; fi + - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./test/ci/travis/setup_php_fpm.sh; ./test/ci/travis/setup_apache.sh; fi + - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./test/ci/travis/setup_hhvm.sh; ./test/ci/travis/setup_apache_hhvm.sh; fi - ./tests/ci/travis/setup_privoxy.sh script: diff --git a/test/ci/travis/setup_apache.sh b/test/ci/travis/setup_apache.sh index a39d676..cd85e4d 100755 --- a/test/ci/travis/setup_apache.sh +++ b/test/ci/travis/setup_apache.sh @@ -6,6 +6,6 @@ sudo a2enmod rewrite actions fastcgi alias ssl # configure apache virtual hosts -sudo cp -f tests/ci/travis/apache_vhost /etc/apache2/sites-available/default +sudo cp -f test/ci/travis/apache_vhost /etc/apache2/sites-available/default sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default sudo service apache2 restart diff --git a/test/ci/travis/setup_apache_hhvm.sh b/test/ci/travis/setup_apache_hhvm.sh index a72941d..6910ccf 100755 --- a/test/ci/travis/setup_apache_hhvm.sh +++ b/test/ci/travis/setup_apache_hhvm.sh @@ -6,6 +6,6 @@ sudo a2enmod rewrite actions fastcgi alias ssl # configure apache virtual hosts -sudo cp -f tests/ci/travis/apache_vhost_hhvm /etc/apache2/sites-available/default +sudo cp -f test/ci/travis/apache_vhost_hhvm /etc/apache2/sites-available/default sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default sudo service apache2 restart diff --git a/test/ci/travis/setup_privoxy.sh b/test/ci/travis/setup_privoxy.sh index 12e0e61..4cd1a59 100755 --- a/test/ci/travis/setup_privoxy.sh +++ b/test/ci/travis/setup_privoxy.sh @@ -2,5 +2,5 @@ # configure privoxy -sudo cp -f tests/ci/travis/privoxy /etc/privoxy/config +sudo cp -f test/ci/travis/privoxy /etc/privoxy/config sudo service privoxy restart -- 2.43.0