diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-02-02 19:15:23 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-02-02 19:15:23 +0800 |
| commit | 066b809d1dff3644b2b231fbe0a7fdf6de38b498 (patch) | |
| tree | 2a9094d3dcd54502a2c2d2cf96c464e6c31e8ed9 | |
| parent | 32ffb39414bf96c12720ba61515c37e652c4b896 (diff) | |
| download | gitlab-ce-42656-use-bundler-version-on-omnibus.tar.gz | |
Set GEM_PATH explicitly42656-use-bundler-version-on-omnibus
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | scripts/prepare_build.sh | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c835fd3c49e..31c7193580e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,9 +34,9 @@ variables: FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json before_script: - - bundle --version - source scripts/utils.sh - source scripts/prepare_build.sh + - bundle --version stages: - build diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index dc8b301cfb4..54e6107700d 100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -4,13 +4,14 @@ export SETUP_DB=${SETUP_DB:-true} export CREATE_DB_USER=${CREATE_DB_USER:-$SETUP_DB} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} export BUNDLE_INSTALL_FLAGS="--without=production --jobs=$(nproc) --path=vendor --retry=3 --quiet" +export GEM_PATH=/usr/local/bundle if [ "$USE_BUNDLE_INSTALL" != "false" ]; then - # if there's a comma (,), then we have multiple bundlers - if gem list -qe bundler | grep -q ,; then - # Uninstall non-default bundler to make sure we're using the one - gem uninstall -i /usr/local/lib/ruby/gems/2.3.0 bundler - fi + # # if there's a comma (,), then we have multiple bundlers + # if gem list -qe bundler | grep -q ,; then + # # Uninstall non-default bundler to make sure we're using the one + # gem uninstall -i /usr/local/lib/ruby/gems/2.3.0 bundler + # fi retry gem install bundler -v 1.13.7 bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi |