GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 075d2bac authored by Lin Jen-Shin's avatar Lin Jen-Shin

Properly use $BUNDLE_INSTALL_FLAGS

parent 11ef3154
......@@ -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
......
......@@ -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"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment