summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-26 17:37:01 +0200
committerRémy Coutable <remy@rymai.me>2017-04-26 17:37:01 +0200
commitb45b08cbbfeabdd0a7d0f1c03a2584e58ebe684b (patch)
treeb7e0c1d91464ded125d952277d5c2266b447e208
parentd39b16d06d9e98fbd1898140341a0e08ee61edf3 (diff)
downloadgitlab-ce-b45b08cbbfeabdd0a7d0f1c03a2584e58ebe684b.tar.gz
Run `bundle check` after `bundle install` instead of having a dedicated job for it31464-move-bundle-check-to-before_script
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab-ci.yml7
-rwxr-xr-xscripts/prepare_build.sh2
2 files changed, 1 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a16a0aaba0..5ea1d89e659 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -402,13 +402,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