git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a4e868b
)
try to fix travis
author
gggeek
<giunta.gaetano@gmail.com>
Fri, 30 Jun 2017 23:16:47 +0000
(
00:16
+0100)
committer
gggeek
<giunta.gaetano@gmail.com>
Fri, 30 Jun 2017 23:16:47 +0000
(
00:16
+0100)
.travis.yml
patch
|
blob
|
history
test/ci/travis/setup_apache.sh
patch
|
blob
|
history
test/ci/travis/setup_apache_hhvm.sh
patch
|
blob
|
history
test/ci/travis/setup_privoxy.sh
patch
|
blob
|
history
diff --git
a/.travis.yml
b/.travis.yml
index
6df5756
..
4950722
100644
(file)
--- 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
# Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
- - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./test
s/ci/travis/setup_php_fpm.sh; ./tests
/ci/travis/setup_apache.sh; fi
- - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./test
s/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:
- ./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
(executable)
--- 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 a2enmod rewrite actions fastcgi alias ssl
# configure apache virtual hosts
-sudo cp -f test
s
/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
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
(executable)
--- 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 a2enmod rewrite actions fastcgi alias ssl
# configure apache virtual hosts
-sudo cp -f test
s
/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
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
(executable)
--- a/
test/ci/travis/setup_privoxy.sh
+++ b/
test/ci/travis/setup_privoxy.sh
@@
-2,5
+2,5
@@
# configure privoxy
# configure privoxy
-sudo cp -f test
s
/ci/travis/privoxy /etc/privoxy/config
+sudo cp -f test/ci/travis/privoxy /etc/privoxy/config
sudo service privoxy restart
sudo service privoxy restart