diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 16:02:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-13 16:02:36 +0800 |
| commit | 075d2bacfd6e9d34763ac905c45c8a7dc1278c35 (patch) | |
| tree | 622024f35903257fd485a10221e3c014e51b615a | |
| parent | 11ef3154bbd7073a3083e05a79f4bf022ccd6859 (diff) | |
| download | gitlab-ce-test-pg-mysql.tar.gz | |
Properly use $BUNDLE_INSTALL_FLAGStest-pg-mysqltest-pg
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | scripts/prepare_build.sh | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ffc60dc6a0..1e87814c49b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -427,10 +427,10 @@ bundler:audit: script: - git fetch origin v8.14.10 - git checkout -f FETCH_HEAD - - bundle install --without production --jobs $(nproc) $FLAGS --retry=3 + - bundle install $BUNDLE_INSTALL_FLAGS - bundle exec rake db:drop db:create db:schema:load db:seed_fu - git checkout $CI_COMMIT_SHA - - bundle install --without production --jobs $(nproc) $FLAGS --retry=3 + - bundle install $BUNDLE_INSTALL_FLAGS - . scripts/prepare_build.sh - bundle exec rake db:migrate diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 8c5ffe92960..de7379425cf 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -4,6 +4,7 @@ export SETUP_DB=${SETUP_DB:-true} export USE_BUNDLE_INSTALL=${USE_BUNDLE_INSTALL:-true} +export BUNDLE_INSTALL_FLAGS="--without production --jobs $(nproc) --path vendor --retry 3 --quiet" # Determine the database by looking at the job name. # For example, we'll get pg if the job is `rspec pg 19 20` @@ -31,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 --without production --jobs $(nproc) --clean $FLAGS + retry bundle install --clean $BUNDLE_INSTALL_FLAGS fi # Only install knapsack after bundle install! Otherwise oddly some native @@ -45,5 +46,3 @@ if [ "$SETUP_DB" != "false" ]; then bundle exec rake add_limits_mysql fi fi - -export FLAGS="--path vendor --retry 3 --quiet" |