diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-23 15:21:35 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-23 15:21:35 +0000 |
| commit | a44c9b9e8e8dfbbc37056e812c3b263eb92b644b (patch) | |
| tree | b590f8daafd8cdefac4e0261b8f8ee66eb7e461f /.gitlab-ci.yml | |
| parent | 010790ee39069f82ced551db6a98f9234c5c81f7 (diff) | |
| parent | 2f8fa73b40193954e97ae580bab8df45f3c10c5a (diff) | |
| download | gitlab-ce-a44c9b9e8e8dfbbc37056e812c3b263eb92b644b.tar.gz | |
Merge branch 'zj-fix-flags-usage-gitlab-ci-yml' into 'master'
Fix BASH usage in the .gitlab-ci.yml
As discussed on Slack. Even though I created the fix, I was a mere code monkey in this case.
See merge request !7693
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7528849c09..3c357c489f8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ before_script: - source ./scripts/prepare_build.sh - cp config/gitlab.yml.example config/gitlab.yml - bundle --version - - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"' + - '[ "$USE_BUNDLE_INSTALL" != "true" ] || retry bundle install --without postgres production --jobs $(nproc) $FLAGS' - retry gem install knapsack - '[ "$SETUP_DB" != "true" ] || bundle exec rake db:drop db:create db:schema:load db:migrate add_limits_mysql' @@ -328,7 +328,7 @@ migration paths: - git checkout -f FETCH_HEAD - 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 + - bundle install --without postgres production --jobs $(nproc) $FLAGS --retry=3 - rake db:drop db:create db:schema:load db:seed_fu - git checkout $CI_BUILD_REF - source scripts/prepare_build.sh |