diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 16:20:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 16:20:45 +0000 |
commit | d298fad0c0564454271cba11e6f20c19681534ac (patch) | |
tree | 0a19d07d8b3bdd2574617305c300e404f2ace581 /scripts/prepare_build.sh | |
parent | c9f9eec79cab801a50db698f682aacffbedf07f7 (diff) | |
download | gitlab-ce-13.9.0-rc41.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc41
Diffstat (limited to 'scripts/prepare_build.sh')
-rw-r--r-- | scripts/prepare_build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index e95f20bc26c..cd41aa0ff14 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -6,7 +6,8 @@ export BUNDLE_INSTALL_FLAGS=${BUNDLE_INSTALL_FLAGS:-"--without=production develo if [ "$USE_BUNDLE_INSTALL" != "false" ]; then bundle --version - run_timed_command "bundle install --clean ${BUNDLE_INSTALL_FLAGS}" + bundle config set clean 'true' + run_timed_command "bundle install ${BUNDLE_INSTALL_FLAGS}" run_timed_command "bundle check" # When we test multiple versions of PG in the same pipeline, we have a single `setup-test-env` # job but the `pg` gem needs to be rebuilt since it includes extensions (https://guides.rubygems.org/gems-with-extensions). |