From 41a510fbb40e00f622bd85dbedf95e7381c9c9ef Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Mon, 16 Jul 2018 12:45:41 +0200
Subject: [PATCH] More work on travis

---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1ffe3c..2db2815 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,10 @@ rvm:
   - 2.3.4
   - 2.2.7
 
+# Not working, because REDMINE_PATH is not set at this stage
+#gemfile:
+#  - $REDMINE_PATH/Gemfile
+
 env:
   - REDMINE_VER=3.4-stable DB=postgresql
   # - REDMINE_VER=master
@@ -16,16 +20,17 @@ addons:
 
 before_install:
   - export PLUGIN_NAME=redmine_messenger
-  - export REDMINE_PATH=$HOME/redmine
   - export REDMINE_GIT_REPO=git://github.com/redmine/redmine.git
+  - export REDMINE_PATH=$HOME/redmine
+  - export BUNDLE_GEMFILE=$REDMINE_PATH/Gemfile
+  - cd $REDMINE_PATH
   - git clone $REDMINE_GIT_REPO $REDMINE_PATH
   - if [[ "$REDMINE_VER" == "master" ]]; then wget https://www.redmine.org/attachments/download/21044/use_migration_context_with_test2.patch; fi
   - if [[ "$REDMINE_VER" == "master" ]]; then patch -p0 < use_migration_context_with_test2.patch; fi
   - 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 test/support/additional_environment.rb $REDMINE_PATH/config/
-  - cp test/support/database-$DB-travis.yml $REDMINE_PATH/config/database.yml
-  - cd $REDMINE_PATH
+  - 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
 
 install: "echo skip bundle install"