diff options
| author | brantje <brantje@gmail.com> | 2016-10-07 21:11:49 +0300 |
|---|---|---|
| committer | brantje <brantje@gmail.com> | 2016-10-07 21:11:49 +0300 |
| commit | 9c33bae393e7e388448920b9a42ba5f1b242d5f7 (patch) | |
| tree | f7a4512919bff7d26e6c2b773f4eb9f0cfa6ab1c /.travis.yml | |
| parent | 1a4740567aee0af91df4e5c109d2f077fe65c5d1 (diff) | |
Update travis
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index 6b1fdad0..7d6e8703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,24 +4,24 @@ language: php php: - 5.6 - 7 -env: - global: - - CORE_BRANCH=stable9 - matrix: - - DB=pgsql - -matrix: - allow_failures: - - env: DB=pgsql CORE_BRANCH=master - include: - - php: 5.6 - env: DB=sqlite - - php: 5.6 - env: DB=mysql - - php: 5.6 - env: DB=pgsql CORE_BRANCH=master - fast_finish: true - +#env: +# global: +# - CORE_BRANCH=stable9 +# matrix: +# - DB=pgsql +# +#matrix: +# allow_failures: +# - env: DB=pgsql CORE_BRANCH=master +# include: +# - php: 5.6 +# env: DB=sqlite +# - php: 5.6 +# env: DB=mysql +# - php: 5.6 +# env: DB=pgsql CORE_BRANCH=master +# fast_finish: true +# before_install: # enable a display for running JavaScript tests - export DISPLAY=:99.0 @@ -35,17 +35,17 @@ before_install: - cd ../ - git clone https://github.com/owncloud/core.git --recursive --depth 1 -b $CORE_BRANCH owncloud - mv passman owncloud/apps/ - +# before_script: - - if [[ "$DB" == 'pgsql' ]]; then createuser -U travis -s oc_autotest; fi - - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; fi - - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"; fi - - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"; fi +# - if [[ "$DB" == 'pgsql' ]]; then createuser -U travis -s oc_autotest; fi +# - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e 'create database oc_autotest;'; fi +# - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"; fi +# - if [[ "$DB" == 'mysql' ]]; then mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"; fi - cd owncloud - mkdir data - - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass='' - - ./occ app:enable passman - - php -S localhost:8080 & +# - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass='' +# - ./occ app:enable passman +# - php -S localhost:8080 & - cd apps/passman script: |