diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 15:11:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-20 15:11:06 +0300 |
commit | f2ebc27236ecef67e67da1da864bbf58e9b9c267 (patch) | |
tree | d6fccf4eec0dd09f1ad009cacbf157298fbecfec /scripts | |
parent | 8994750e4e1beb9f6d1b37c1625fba5868b9babf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-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). |