summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-01-31 09:25:09 +0000
committerRémy Coutable <remy@rymai.me>2017-01-31 09:25:09 +0000
commitfef6f52b818910a44fac28ee4673d6b880b7263a (patch)
tree83435d08b4444addf5614989d4e4f861f6be1ec7
parent211f728ad26cb6ee936fa48f601c5bf8e7456ad0 (diff)
parent8c5d55ea335ecda22e74875f28ba43a6cb97467f (diff)
downloadgitlab-ce-fef6f52b818910a44fac28ee4673d6b880b7263a.tar.gz
Merge branch 'ensure-rake-is-called-within-the-correct-bundle-context' into 'master'
Ensure rake is called within the correct bundle context See merge request !8882
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 782a43cbe74..deb5345d3bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,7 +271,7 @@ rake db:migrate:reset:
<<: *use-db
<<: *dedicated-runner
script:
- - rake db:migrate:reset
+ - bundle exec rake db:migrate:reset
rake db:seed_fu:
stage: test
@@ -302,7 +302,7 @@ teaspoon:
script:
- npm install
- npm link istanbul
- - rake teaspoon
+ - bundle exec rake teaspoon
artifacts:
name: coverage-javascript
expire_in: 31d
@@ -353,10 +353,10 @@ migration paths:
- cp config/resque.yml.example config/resque.yml
- sed -i 's/localhost/redis/g' config/resque.yml
- bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3
- - rake db:drop db:create db:schema:load db:seed_fu
+ - bundle exec rake db:drop db:create db:schema:load db:seed_fu
- git checkout $CI_BUILD_REF
- source scripts/prepare_build.sh
- - rake db:migrate
+ - bundle exec rake db:migrate
coverage:
stage: post-test