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

Merge branch '31464-move-bundle-check-to-before_script' into 'master'
c4209bcc · Robert Speicher · 5976195f · b45b08cb · c4209bcc · c4209bcc
Commit c4209bcc authored Apr 27, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -7

prepare_build.sh scripts/prepare_build.sh +1 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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

--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -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