diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-07-29 19:13:24 +0000 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-07-29 19:13:24 +0000 |
| commit | 9d3c0ae7b3adc277832ffb565a7882fbef746dd4 (patch) | |
| tree | acf6a13135d95f4458a66e3ac8c132ce970b6cc5 /run.sh | |
| parent | a7beb59fc46f4acc1a454bb7d70185637c9c1fc7 (diff) | |
| parent | bee3afe69d5324c557bf125864590eb5f1c78b49 (diff) | |
Merge branch 'revert-0ea7eb0c' into 'master'v1.5.0
Revert "Merge branch 'upgrade-docker-license-finder' into 'master'"
See merge request gitlab-org/security-products/license-management!49
Diffstat (limited to 'run.sh')
| -rwxr-xr-x | run.sh | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -95,6 +95,9 @@ case "$COMMAND" in analyze) # Analyze project + # Load RVM + source /rvm.sh + # Change current directory to the project path. APP_PATH=$1 shift @@ -109,9 +112,7 @@ case "$COMMAND" in # So we ignore the error. $($rvm_recommended_ruby) 2>/dev/null || true rvm use . - # rvm pulls outdated gems - # need this to update system bundler - gem update --system + gem install bundler # We need to install the license_finder gem into this Ruby version too. gem install license_finder -v "$LICENSE_FINDER_VERSION" fi @@ -119,7 +120,7 @@ case "$COMMAND" in # Ignore test and development dependencies. license_finder ignored_groups add development license_finder ignored_groups add test - bundle install + bundle install --without "development test" skip_prepare=true fi |
