diff options
| author | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-06-14 17:47:27 +0300 |
|---|---|---|
| committer | Tetiana Chupryna <tchupryna@gitlab.com> | 2020-06-14 17:47:27 +0300 |
| commit | e0638933fce03c19c37f384d3dd89d76d4afdae7 (patch) | |
| tree | 1cc13d4b0bf8bbdc2f2b28bba466bf5fed6dd84b | |
| parent | 478bd8cbc5142609088f06573245d86cec8391e3 (diff) | |
Update default name of the generated report
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rwxr-xr-x | run.sh | 2 | ||||
| -rw-r--r-- | spec/support/integration_test_helper.rb | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fae87c..23f19aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.12.0 + +- Update default name of the generated report. (!TBA) + ## v3.11.2 - Ensure `LM_*_VERSION` variables take precedence over `ASDF_*_VERSION` variables. (!163) @@ -108,6 +108,7 @@ The License Management tool can be customized with environments variables for so | LM_JAVA_VERSION | Java (Maven) | Version of Java. If set to `11`, Maven and Gradle use Java 11 instead of Java 8. | | LM_PYTHON_VERSION | Python | Version of Python. If set to `3`, dependencies are installed using Python 3 instead of Python 2.7. | | LOG_LEVEL | * | Control the verbosity of the logs. (`debug`, `info`, `warn` (default), `error`, `fatal`) | +| LM_REPORT_FILE | * | Name of the generated report. If not supplied, defaults to `gl-license-scanning-report.json` | Inject the required environment variables to the docker command using the [`--env` option flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file) @@ -19,7 +19,7 @@ export LANG=C.UTF-8 export LICENSE_FINDER_CLI_OPTS=${LICENSE_FINDER_CLI_OPTS:=--no-debug} export LM_JAVA_VERSION=${LM_JAVA_VERSION:-} export LM_PYTHON_VERSION=${LM_PYTHON_VERSION:-} -export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-management-report.json'} +export LM_REPORT_FILE=${LM_REPORT_FILE:-'gl-license-scanning-report.json'} export MAVEN_CLI_OPTS="${MAVEN_CLI_OPTS:--DskipTests}" export NO_UPDATE_NOTIFIER=true export PIPENV_VENV_IN_PROJECT=1 diff --git a/spec/support/integration_test_helper.rb b/spec/support/integration_test_helper.rb index f474265..5c9de94 100644 --- a/spec/support/integration_test_helper.rb +++ b/spec/support/integration_test_helper.rb @@ -69,7 +69,7 @@ module IntegrationTestHelper def scan(env: {}) return {} unless execute(env, './bin/docker-test', project_path.to_s) - report_path = project_path.join('gl-license-management-report.json') + report_path = project_path.join('gl-license-scanning-report.json') return {} unless report_path.exist? Report.new(report_path.read) |