Merge branch '31464-move-bundle-check-to-before_script' into 'master'

Run `bundle check` after `bundle install` instead of having a dedicated job for it

Closes #31464

See merge request !10944
This commit is contained in:
Robert Speicher 2017-04-27 20:37:31 +00:00
commit c4209bcc77
2 changed files with 1 additions and 8 deletions

View File

@ -403,13 +403,6 @@ docs:check:links:
# Check the internal links
- bundle exec nanoc check internal_links
bundler:check:
stage: test
<<: *dedicated-runner
<<: *ruby-static-analysis
script:
- bundle check
bundler:audit:
stage: test
<<: *ruby-static-analysis

View File

@ -32,7 +32,7 @@ sed -i 's/localhost/redis/g' config/resque.yml
cp config/gitlab.yml.example config/gitlab.yml
if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
retry bundle install --clean $BUNDLE_INSTALL_FLAGS
retry bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
fi
# Only install knapsack after bundle install! Otherwise oddly some native