diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 16:19:23 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-01-23 16:19:23 +0100 |
| commit | 8a4f97c66a7d4dce07fece4dc059c0be0a2b6f33 (patch) | |
| tree | 8d715d4d7df9dc917310e2ffa15bf5232821af50 | |
| parent | 551fcc2e32decd32bd9720b3fcdf561cfca45e86 (diff) | |
split up travis conf
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | tests/travis/travis-ci-apache.conf (renamed from tests/travis/travis-ci-apache) | 0 | ||||
| -rw-r--r-- | tests/travis/travis-ci-apache.sh | 13 |
3 files changed, 14 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 2a1da3246..68febcd68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ install: - export CHROME_BIN=/usr/bin/chromium-browser - sudo easy_install3 requests - sudo easy_install3 ocdev - - ocdev --version # clone core - ocdev setup core --dir owncloud --branch master - mv news owncloud/apps/ @@ -41,13 +40,7 @@ before_script: - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost';" - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';" # set up php under apache - - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - - sudo a2enmod rewrite actions fastcgi alias - - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm - - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache /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 + - bash owncloud/apps/news/tests/travis/travis-ci-apache.sh # fill owncloud with default configs and enable news - cd owncloud - mkdir apps2 diff --git a/tests/travis/travis-ci-apache b/tests/travis/travis-ci-apache.conf index 5cfd3ccd0..5cfd3ccd0 100644 --- a/tests/travis/travis-ci-apache +++ b/tests/travis/travis-ci-apache.conf diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh new file mode 100644 index 000000000..d8a514a72 --- /dev/null +++ b/tests/travis/travis-ci-apache.sh @@ -0,0 +1,13 @@ +# set up php under apache +if [[ $(phpenv version-name) != 'hhvm' ]]; then + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf + sudo a2enmod rewrite actions fastcgi alias + echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm + sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /etc/apache2/sites-available/default + sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default +else + +fi + +sudo service apache2 restart
\ No newline at end of file |