More work on travis

2018-07-16 12:56:57 +02:00
parent bb1920f1ce
commit 9339ad53b2
3 changed files with 4 additions and 1 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -40,3 +40,6 @@ Style/AutoResourceCleanup:

 Style/Documentation:
  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_install:
  - if [[ "$REDMINE_VER" != "master" ]]; then git checkout -b $REDMINE_VER origin/$REDMINE_VER; fi
  - ln -s $TRAVIS_BUILD_DIR $REDMINE_PATH/plugins/$PLUGIN_NAME
  - cp $TRAVIS_BUILD_DIR/test/support/additional_environment.rb $REDMINE_PATH/config/
-  - cp $TRAVIS_BUILD_DIR/test/support/database_$DB_travis.yml $REDMINE_PATH/config/database.yml
+  - cp $TRAVIS_BUILD_DIR/test/support/database-$DB-travis.yml $REDMINE_PATH/config/database.yml

 install: "echo skip bundle install"

--- a/test/support/database-postgresql-travis.yml
+++ b/test/support/database-postgresql-travis.yml