Skip to content

Commit 21bf24b

Browse files
committed
Rename the ORT env variable
In order to avoid collisions in addEnvironmentSource() introduced in [1]. [1]: oss-review-toolkit/ort@8096840 Signed-off-by: Andriy Zhernovskyi <[email protected]>
1 parent 065a683 commit 21bf24b

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ ort-scan:
123123
- cache/ivy2/cache
124124
- cache/sbt
125125
variables:
126-
ORT: "/opt/ort/bin/ort"
126+
ORT_CLI: "/opt/ort/bin/ort"
127127

128128
ORT_ADVISOR_PROVIDERS: "OssIndex"
129129

@@ -223,7 +223,7 @@ ort-scan:
223223
- echo "export ORT_DISABLE_ADVISOR='${ORT_DISABLE_ADVISOR:-'false'}'" >> vars.env
224224
- echo "export ORT_DISABLE_EVALUATOR='${ORT_DISABLE_EVALUATOR:-'false'}'" >> vars.env
225225
- echo "export ORT_DISABLE_SCANNER='${ORT_DISABLE_SCANNER:-'false'}'" >> vars.env
226-
- export ORT_VERSION=$($ORT --version)
226+
- export ORT_VERSION=$($ORT_CLI --version)
227227
- echo "export ORT_VERSION='$ORT_VERSION'" >> vars.env
228228

229229
- ./scripts/check-vars.sh
@@ -265,7 +265,7 @@ ort-scan:
265265
- |
266266
if [[ ! -z "$ORT_REVISION" ]]; then
267267
./scripts/setup-ort.sh
268-
export ORT="$CI_PROJECT_DIR/bin/ort"
268+
export ORT_CLI="$CI_PROJECT_DIR/bin/ort"
269269
export ORTH="$CI_PROJECT_DIR/bin/orth"
270270
fi
271271

scripts/ort-advisor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ else
99
ORT_RESULTS_INPUT_FILE=$ORT_RESULTS_SCANNER_FILE
1010
fi
1111

12-
$ORT \
12+
$ORT_CLI \
1313
--$ORT_LOG_LEVEL \
1414
--stacktrace \
1515
advise \

scripts/ort-analyzer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ echo "------------------------------------------"
4949
echo "Running ORT analyzer..."
5050
echo "------------------------------------------"
5151

52-
$ORT \
52+
$ORT_CLI \
5353
--$ORT_LOG_LEVEL \
5454
--stacktrace \
5555
$ORT_OPTIONS \

scripts/ort-downloader.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "------------------------------------------"
99
# Remove all special characters and whitespace from the PROJECT_NAME, because some tools cannot handle them.
1010
SAFE_SW_NAME=$(echo $SW_NAME | sed -e 's/[^A-Za-z0-9 \-\_]//g' -e 's/\s/_/g')
1111

12-
$ORT \
12+
$ORT_CLI \
1313
--$ORT_LOG_LEVEL \
1414
--stacktrace \
1515
download \

scripts/ort-evaluator.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ else
4545
echo "Error: ORT policy rules file (*.rules.kts) not found. Please set ORT_CONFIG_RULES_FILE"
4646
fi
4747

48-
$ORT \
48+
$ORT_CLI \
4949
--$ORT_LOG_LEVEL \
5050
--stacktrace \
5151
evaluate \
@@ -61,7 +61,7 @@ if [ $EXIT_CODE -ge 2 ]; then
6161
fi
6262

6363
# Upload the final ORT result to PostgreSQL.
64-
# $ORT \
64+
# $ORT_CLI \
6565
# --$ORT_LOG_LEVEL \
6666
# --stacktrace \
6767
# -c $ORT_CLI_CONFIG_FILE \

scripts/ort-reporter.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fi
6161
# ORT_REPORTER_OPTIONS="$ORT_REPORTER_OPTIONS -O SpdxDocument=document.name='${SW_NAME}' \ -O SpdxDocument=output.file.formats=json,yaml"
6262
# fi
6363

64-
$ORT \
64+
$ORT_CLI \
6565
--$ORT_LOG_LEVEL \
6666
--stacktrace \
6767
report \

scripts/ort-scanner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
export JAVA_OPTS="-Xmx24G"
66

77
echo "Scan source code for packages defined as dependencies and store results in $ORT_RESULTS_DIR."
8-
$ORT \
8+
$ORT_CLI \
99
--$ORT_LOG_LEVEL \
1010
--stacktrace \
1111
-c $ORT_CLI_CONFIG_FILE \

0 commit comments

Comments
 (0)