diff options
| author | mo khan <mo.khan@gmail.com> | 2020-04-01 09:16:44 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-04-01 09:19:47 -0600 |
| commit | feedd873aa2b04ab4d74f599de66364f341b0155 (patch) | |
| tree | fe06c92cec535fb7bd35debd9ec9516ab8c023da | |
| parent | fec5e888a10f6d6c0a64d17242d293fc9da6d3d2 (diff) | |
Fix bug with forwarding LICENSE_FINDER_CLI_OPTS
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 | ||||
| -rwxr-xr-x | run.sh | 5 | ||||
| -rw-r--r-- | spec/integration/ruby/bundler_spec.rb | 10 |
5 files changed, 19 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b6928e4..98beed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.3.1 + +- Fix bug with forwarding `LICENSE_FINDER_CLI_OPTS` (!131) + ## v3.3.0 - Scan Python projects with [pip-licenses](https://pypi.org/project/pip-licenses/). (!128) diff --git a/Gemfile.lock b/Gemfile.lock index 812a1ef..a8a1160 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - license-management (3.3.0) + license-management (3.3.1) license_finder (~> 6.0.0) spandx (~> 0.1) diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index 22f92ca..e535634 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.3.0' + VERSION = '3.3.1' end end @@ -11,7 +11,7 @@ export CI_DEBUG_TRACE=${CI_DEBUG_TRACE:='false'} export DOTNET_CLI_TELEMETRY_OPTOUT=1 export HISTFILESIZE=0 export HISTSIZE=0 -export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:='--no-debug'} +export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug} export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'} export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}" export PREPARE="${PREPARE:---prepare-no-fail}" @@ -47,7 +47,8 @@ function scan_project() { license_management ignored_groups add development license_management ignored_groups add test echo license_management report "$@" - license_management report "$@" + # shellcheck disable=SC2068 + license_management report $@ } function prepare_javascript() { diff --git a/spec/integration/ruby/bundler_spec.rb b/spec/integration/ruby/bundler_spec.rb index 1245563..f2f2873 100644 --- a/spec/integration/ruby/bundler_spec.rb +++ b/spec/integration/ruby/bundler_spec.rb @@ -128,4 +128,14 @@ BUNDLED WITH }) end end + + context "when passing custom options to license finder" do + it 'forwards the options to license finder' do + report = runner.scan(env: { + 'LICENSE_FINDER_CLI_OPTS' => "--debug --aggregate-paths=. ruby" + }) + + expect(report).to match_schema(version: '2.0') + end + end end |
