diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-01-23 09:04:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-23 09:04:54 +0100 |
commit | a8f4f7665c98753cca15140c283d49e0aa4cd0ab (patch) | |
tree | 7df997ee90b72b108840aecebbb906a013727981 | |
parent | 3527c300215e6e6010efb8bb840b8b6f5c63a1cc (diff) | |
parent | e19fc0266514efc13efe56f55ddbf3ecc940c2e8 (diff) | |
download | wallabag-a8f4f7665c98753cca15140c283d49e0aa4cd0ab.tar.gz wallabag-a8f4f7665c98753cca15140c283d49e0aa4cd0ab.tar.zst wallabag-a8f4f7665c98753cca15140c283d49e0aa4cd0ab.zip |
Merge pull request #3864 from wallabag/fix/database-init-version
Removed hardcoded database version
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | app/config/config.yml | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index ac64839d..0ca1e192 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -35,7 +35,6 @@ matrix: | |||
35 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite | 35 | env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite |
36 | allow_failures: | 36 | allow_failures: |
37 | - php: nightly | 37 | - php: nightly |
38 | - php: 7.3 | ||
39 | 38 | ||
40 | # exclude v1 branches | 39 | # exclude v1 branches |
41 | branches: | 40 | branches: |
@@ -56,7 +55,6 @@ before_script: | |||
56 | # xdebug isn't enable for PHP 7.1 | 55 | # xdebug isn't enable for PHP 7.1 |
57 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi | 56 | - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi |
58 | - composer self-update --no-progress | 57 | - composer self-update --no-progress |
59 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | ||
60 | 58 | ||
61 | script: | 59 | script: |
62 | - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist | 60 | - 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: | |||
54 | charset: "%database_charset%" | 54 | charset: "%database_charset%" |
55 | path: "%database_path%" | 55 | path: "%database_path%" |
56 | unix_socket: "%database_socket%" | 56 | unix_socket: "%database_socket%" |
57 | server_version: 5.6 | ||
58 | 57 | ||
59 | orm: | 58 | orm: |
60 | auto_generate_proxy_classes: "%kernel.debug%" | 59 | auto_generate_proxy_classes: "%kernel.debug%" |