diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-27 20:37:31 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-27 20:37:31 +0000 |
| commit | c4209bcc776b0af6bc697a069e08368d445dcc9e (patch) | |
| tree | 036e38ec947e0dbe58c9260a63f6dcb7b662bb4d | |
| parent | 5976195fef53fe1bc56647dfc06049a8f984d5fe (diff) | |
| parent | b45b08cbbfeabdd0a7d0f1c03a2584e58ebe684b (diff) | |
| download | gitlab-ce-c4209bcc776b0af6bc697a069e08368d445dcc9e.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 230ca698ad0..50f1f65e4e8 100644 --- 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 diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index de7379425cf..fd173c0ba88 100755 --- 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 |