From: Jérémy Benoist Date: Wed, 23 Jan 2019 08:04:54 +0000 (+0100) Subject: Merge pull request #3864 from wallabag/fix/database-init-version X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a8f4f7665c98753cca15140c283d49e0aa4cd0ab;hp=3527c300215e6e6010efb8bb840b8b6f5c63a1cc;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3864 from wallabag/fix/database-init-version Removed hardcoded database version --- diff --git a/.travis.yml b/.travis.yml index ac64839d..0ca1e192 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ matrix: env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite allow_failures: - php: nightly - - php: 7.3 # exclude v1 branches branches: @@ -56,7 +55,6 @@ before_script: # xdebug isn't enable for PHP 7.1 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - composer self-update --no-progress - - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; script: - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist diff --git a/app/config/config.yml b/app/config/config.yml index ee0f0a38..4b34af30 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -54,7 +54,6 @@ doctrine: charset: "%database_charset%" path: "%database_path%" unix_socket: "%database_socket%" - server_version: 5.6 orm: auto_generate_proxy_classes: "%kernel.debug%"