Commit c4209bcc authored by Robert Speicher's avatar Robert Speicher

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
parents 5976195f b45b08cb
...@@ -403,13 +403,6 @@ docs:check:links: ...@@ -403,13 +403,6 @@ docs:check:links:
# Check the internal links # Check the internal links
- bundle exec nanoc check internal_links - bundle exec nanoc check internal_links
bundler:check:
stage: test
<<: *dedicated-runner
<<: *ruby-static-analysis
script:
- bundle check
bundler:audit: bundler:audit:
stage: test stage: test
<<: *ruby-static-analysis <<: *ruby-static-analysis
......
...@@ -32,7 +32,7 @@ sed -i 's/localhost/redis/g' config/resque.yml ...@@ -32,7 +32,7 @@ sed -i 's/localhost/redis/g' config/resque.yml
cp config/gitlab.yml.example config/gitlab.yml cp config/gitlab.yml.example config/gitlab.yml
if [ "$USE_BUNDLE_INSTALL" != "false" ]; then if [ "$USE_BUNDLE_INSTALL" != "false" ]; then
retry bundle install --clean $BUNDLE_INSTALL_FLAGS retry bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check
fi fi
# Only install knapsack after bundle install! Otherwise oddly some native # Only install knapsack after bundle install! Otherwise oddly some native
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment