diff options
| author | WolFi <wolfi@wolfi.es> | 2021-03-22 17:24:51 +0300 |
|---|---|---|
| committer | WolFi <wolfi@wolfi.es> | 2021-03-22 17:24:51 +0300 |
| commit | 80d7fe7100d0eb756d1b518bc6bc4867d0c1a954 (patch) | |
| tree | fa8e87fa41ff630393ad402dfdd377e9eef58515 /.travis.yml | |
| parent | 2eb0bfa6303105615d46eb8a1fbf687919f912a8 (diff) | |
| parent | 7be40bb6afc71c7ef2eecf3f7e055aa07166cc27 (diff) | |
Merge branch 'master' into fix/noid/travismysqlerror
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index ddb1ee17..3adf73ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,11 +27,11 @@ services: - xvfb -before_install: - # enable a display for running JavaScript tests + # enable a display for running JavaScript tests #- export DISPLAY=:99.0 # - sh -e /etc/init.d/xvfb start # - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi + - if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi # - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - wget https://raw.githubusercontent.com/$SERVER/before_install.sh - . ./before_install.sh "$APP_NAME" "$CORE_BRANCH" "$DB" |