Skip to content

Commit 9142b43

Browse files
tsteenbefviernau
authored andcommitted
Rename ORT_CONFIG_REPO_SSH_URL variable to ORT_CONFIG_REPO_URL
As this variable can also be HTTPS URL instead of SSH one. Signed-off-by: Thomas Steenbergen <[email protected]>
1 parent 5efa215 commit 9142b43

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ ort-scan:
199199
- export DISABLE_SHALLOW_CLONE=${DISABLE_SHALLOW_CLONE:-"false"}
200200
- export FAIL_ON_OUTDATED_NOTICE_FILE=${FAIL_ON_OUTDATED_NOTICE_FILE:-"false"}
201201
- export ORT_CONFIG_REVISION=${ORT_CONFIG_REVISION:-"main"}
202-
- export ORT_CONFIG_REPO_SSH_URL=${ORT_CONFIG_REPO_SSH_URL:-"https://github.com/oss-review-toolkit/ort-config.git"}
202+
- export ORT_CONFIG_REPO_URL=${ORT_CONFIG_REPO_URL:-"https://github.com/oss-review-toolkit/ort-config.git"}
203203
- export ORT_DISABLE_ADVISOR=${ORT_DISABLE_ADVISOR:-"false"}
204204
- export ORT_DISABLE_EVALUATOR=${ORT_DISABLE_EVALUATOR:-"false"}
205205
- export ORT_DISABLE_SCANNER=${ORT_DISABLE_SCANNER:-"true"}
@@ -217,7 +217,7 @@ ort-scan:
217217
- echo "export SW_NAME='$SW_NAME'" >> vars.env
218218
- echo "export SW_VERSION='$SW_VERSION'" >> vars.env
219219
- echo "export ORT_ALLOW_DYNAMIC_VERSIONS='$ORT_ALLOW_DYNAMIC_VERSIONS'" >> vars.env
220-
- echo "export ORT_CONFIG_REPO_SSH_URL='$ORT_CONFIG_REPO_SSH_URL'" >> vars.env
220+
- echo "export ORT_CONFIG_REPO_URL='$ORT_CONFIG_REPO_URL'" >> vars.env
221221
- echo "export ORT_DISABLE_ADVISOR='${ORT_DISABLE_ADVISOR:-'false'}'" >> vars.env
222222
- echo "export ORT_DISABLE_EVALUATOR='${ORT_DISABLE_EVALUATOR:-'false'}'" >> vars.env
223223
- echo "export ORT_DISABLE_SCANNER='${ORT_DISABLE_SCANNER:-'false'}'" >> vars.env
@@ -272,7 +272,7 @@ ort-scan:
272272
- mkdir -p $ORT_CONFIG_DIR && cd $ORT_CONFIG_DIR
273273
- git config --global init.defaultBranch master
274274
- git init
275-
- git remote add origin $ORT_CONFIG_REPO_SSH_URL
275+
- git remote add origin $ORT_CONFIG_REPO_URL
276276
- git fetch --depth 1 origin $ORT_CONFIG_REVISION
277277
- git checkout FETCH_HEAD
278278
- ORT_CONFIG_REVISION=$(git rev-parse HEAD)

scripts/ort-analyzer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $ORT \
6161
-l VCS_PATH="$VCS_PATH" \
6262
-l LABELS="$LABELS" \
6363
-l ORT_CONFIG_FILE="$ORT_CONFIG_FILE" \
64-
-l ORT_CONFIG_REPO_SSH_URL="$ORT_CONFIG_REPO_SSH_URL" \
64+
-l ORT_CONFIG_REPO_URL="$ORT_CONFIG_REPO_URL" \
6565
-l ORT_CONFIG_REVISION="$ORT_CONFIG_REVISION" \
6666
-l ALLOW_DYNAMIC_VERSIONS="$ORT_ALLOW_DYNAMIC_VERSIONS" \
6767
-l DISABLE_SHALLOW_CLONE="$DISABLE_SHALLOW_CLONE" \

scripts/print-metadata.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jq -n \
1212
--arg vcs_path "$VCS_PATH" \
1313
--arg gitlab_project_id "$GITLAB_PROJECT_ID" \
1414
--arg ort_config_file "$ORT_CONFIG_FILE" \
15-
--arg ort_config_ssh_url "$ORT_CONFIG_REPO_SSH_URL" \
15+
--arg ort_config_url "$ORT_CONFIG_REPO_URL" \
1616
--arg ort_config_revision "$ORT_CONFIG_REVISION" \
1717
--arg ort_allow_dynamic_versions "$ORT_ALLOW_DYNAMIC_VERSIONS" \
1818
--arg notice_file "$NOTICE_FILE" \
@@ -66,7 +66,7 @@ jq -n \
6666
VCS_PATH: $vcs_path,
6767
GITLAB_PROJECT_ID: $gitlab_project_id,
6868
ORT_CONFIG_FILE: $ort_config_file,
69-
ORT_CONFIG_REPO_SSH_URL: $ort_config_ssh_url,
69+
ORT_CONFIG_REPO_URL: $ort_config_url,
7070
ORT_CONFIG_REVISION: $ort_config_revision,
7171
ORT_ALLOW_DYNAMIC_VERSIONS: $ort_allow_dynamic_versions,
7272
DISABLE_SHALLOW_CLONE: $disable_shallow_clone,

0 commit comments

Comments
 (0)