Skip to content

Commit 3c1d1cb

Browse files
committed
fix: Move SPDX reporter options defaults
Align GitLab Job Template for ORT with how the GitHub action for ORT[1] works where the template contains the defaults for variables. Prior to this change only for manually triggered ORT run would be generate SPDX reports as JSON and YAML whilst those triggered in CI would only produce YAML SPDX reports. [1]: https://github.com/oss-review-toolkit/ort-ci-github-action/blob/9acdf1e/action.yml#L144 Signed-off-by: Thomas Steenbergen <[email protected]>
1 parent e1351d9 commit 3c1d1cb

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ variables:
110110
ORT_CLI_REPORT_ARGS:
111111
description: |
112112
List of arguments to pass to ORT Reporter CLI.
113-
value: '-O SpdxDocument=output.file.formats=json,yaml'
113+
value: ''
114114
ORT_CONFIG_REPOSITORY:
115115
description: |
116116
URL to ORT configuration repository to use.

templates/ort-scan.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
export ORT_ALLOW_DYNAMIC_VERSIONS=${ALLOW_DYNAMIC_VERSIONS:-"false"}
8181
export ORT_CLI="/opt/ort/bin/ort"
8282
export ORT_CLI_ARGS=${ORT_CLI_ARGS:-"-P ort.forceOverwrite=true --stacktrace"}
83+
export ORT_CLI_REPORT_ARGS=${ORT_CLI_REPORT_ARGS:-"-O SpdxDocument=output.file.formats=json,yaml"}
8384
export ORT_CONFIG_PATH=${ORT_CONFIG_PATH:-"${ORT_DATA_PATH}/config"}
8485
export ORT_CONFIG_VCS_REVISION=${ORT_CONFIG_REVISION:-"main"}
8586
export ORT_CONFIG_VCS_URL=${ORT_CONFIG_REPOSITORY:-"https://github.com/oss-review-toolkit/ort-config.git"}

0 commit comments

Comments
 (0)