Skip to content

Commit c51bc74

Browse files
committed
Trim trailing whitespace in .gitlab-ci.yml
This reduces the diff in upcoming changes. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 1bfd373 commit c51bc74

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

.gitlab-ci.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# SPDX-License-Identifier: Apache-2.0
1616
# License-Filename: LICENSE
1717

18-
stages:
18+
stages:
1919
- build
2020
- deploy
2121
- ort-scan
@@ -31,30 +31,30 @@ variables:
3131
description: |
3232
Project version number or release name (use the version from package metadata, not VCS revision).
3333
By default, the Git short SHA is used.
34-
VCS_TYPE:
34+
VCS_TYPE:
3535
value: "git"
3636
description: "Identifier of the project version control system (git, git-repo, mercurial or subversion)."
37-
VCS_URL:
37+
VCS_URL:
3838
value: ""
3939
description: "VCS URL (clone URL) of project to scan."
40-
VCS_REVISION:
40+
VCS_REVISION:
4141
value: ""
4242
description: |
4343
SHA1 or tag to scan (not branch names, because they can move). If VCS_TYPE is 'git-repo',
4444
SHA1 must be unabbreviated, tag names must be prefixed with 'refs/tags/'.
4545
VCS_PATH:
4646
value: ""
4747
description: |
48-
Leave this field empty unless one of the following special cases applies: project VCS_TYPE is
48+
Leave this field empty unless one of the following special cases applies: project VCS_TYPE is
4949
git-repo - specify path to repo manifest file (e.g. olympia.xml,
50-
note VCS_URL must point to a manifest repository)
50+
note VCS_URL must point to a manifest repository)
5151
you require sparse checkout - specify repository sub-path to download and scan
5252
(e.g. projects/gradle/, note sparse checkout is possible only for VCS_TYPE
5353
git, mercurial or subversion)
5454
ORT_CONFIG_FILE:
5555
value: ""
5656
description: |
57-
Path to repository configuration file relative to the VCS root.
57+
Path to repository configuration file relative to the VCS root.
5858
By default set to '.ort.yml'.
5959
ORT_ALLOW_DYNAMIC_VERSIONS:
6060
value: ""
@@ -95,10 +95,10 @@ variables:
9595
description: |
9696
If set to 'true', ORT's scanner will not run (no copyright holders and licenses scan).
9797
By default set to 'false'.
98-
ORT_LOG_LEVEL:
98+
ORT_LOG_LEVEL:
9999
value: ""
100100
description: |
101-
Set value to 'debug' to see additional debug output to help tracking down errors.
101+
Set value to 'debug' to see additional debug output to help tracking down errors.
102102
By default set to 'info'.
103103
ORT_REVISION:
104104
value: ""
@@ -111,16 +111,16 @@ variables:
111111
ORT_USE_DEV_DB:
112112
value: "false"
113113
description: "Set to 'true' to download/upload scanned results from/to development database."
114-
REBUILD_DOCKER_IMAGE:
115-
value: "false"
114+
REBUILD_DOCKER_IMAGE:
115+
value: "false"
116116
description: "Set value to 'true' in order to rebuild the Docker image."
117117
ORT_URL: https://github.com/oss-review-toolkit/ort.git
118118
FF_SCRIPT_SECTIONS: "true"
119119

120120

121121
ort-scan:
122122
stage: ort-scan
123-
image:
123+
image:
124124
name: "$ORT_DOCKER_IMAGE"
125125
entrypoint: [""]
126126
tags:
@@ -227,33 +227,33 @@ ort-scan:
227227

228228
# Create ~/.netrc file if NETRC_URL is set.
229229
- |
230-
if [[ ! -z "$NETRC_URL" ]]; then
231-
./scripts/setup-netrc.sh
230+
if [[ ! -z "$NETRC_URL" ]]; then
231+
./scripts/setup-netrc.sh
232232
fi
233233
234234
# Create ~/.ivy2/.credentials file if IVY_CREDS_URL is set.
235235
- |
236-
if [[ ! -z "$IVY_CREDS_URL" ]]; then
237-
./scripts/setup-ivy-credentials.sh
236+
if [[ ! -z "$IVY_CREDS_URL" ]]; then
237+
./scripts/setup-ivy-credentials.sh
238238
fi
239239
240240
# Workaround for maven cache.
241241
- |
242-
if [[ -d "$MAVEN_REPO_LOCAL" ]]; then
242+
if [[ -d "$MAVEN_REPO_LOCAL" ]]; then
243243
mkdir -p ${HOME}/.m2/repository/
244244
mv ${MAVEN_REPO_LOCAL}/* ${HOME}/.m2/repository/
245245
fi
246246
247247
# Workaround for go cache.
248248
- |
249-
if [[ -d "$GO_CACHE_LOCAL" ]]; then
249+
if [[ -d "$GO_CACHE_LOCAL" ]]; then
250250
mkdir -p ${GOPATH}/pkg/mod
251251
mv ${GO_CACHE_LOCAL}/* ${GOPATH}/pkg/mod/
252252
fi
253253
254254
- |
255-
if [[ ! -z "$ORT_REVISION" ]]; then
256-
./scripts/setup-ort.sh
255+
if [[ ! -z "$ORT_REVISION" ]]; then
256+
./scripts/setup-ort.sh
257257
export ORT_CLI="$CI_PROJECT_DIR/bin/ort"
258258
export ORTH="$CI_PROJECT_DIR/bin/orth"
259259
fi
@@ -316,18 +316,18 @@ ort-scan:
316316

317317
# Workaround for maven cache.
318318
- |
319-
if [[ -d "${HOME}/.m2/repository/" ]]; then
319+
if [[ -d "${HOME}/.m2/repository/" ]]; then
320320
mkdir -p $MAVEN_REPO_LOCAL
321321
mv -f ${HOME}/.m2/repository/* $MAVEN_REPO_LOCAL
322322
fi
323323
324324
# Workaround for go cache.
325325
- |
326-
if [[ -d "${GOPATH}/pkg/mod/" ]]; then
326+
if [[ -d "${GOPATH}/pkg/mod/" ]]; then
327327
mkdir -p ${GO_CACHE_LOCAL}
328328
mv ${GOPATH}/pkg/mod/* ${GO_CACHE_LOCAL}
329329
fi
330-
330+
331331
- export JOB_FINISHED_AT=$(date +"%Y-%m-%dT%H:%M:%S%z")
332332

333333
# Create metadata.json which can be used to reproduce the scan
@@ -365,7 +365,7 @@ ort-build-image:
365365
- export ORT_SCANCODE_VERSION=${ORT_SCANCODE_VERSION:-"30.1.0"}
366366
- apk add --no-cache git
367367
- |
368-
if [[ -z "$ORT_REVISION" ]]; then
368+
if [[ -z "$ORT_REVISION" ]]; then
369369
echo "Building the vanilla ORT docker image 'ort'..."
370370
git clone --depth 1 --shallow-submodules --recurse-submodules $ORT_URL
371371
cd ort
@@ -414,7 +414,7 @@ pages:
414414
image: node:lts
415415
tags:
416416
- docker
417-
script:
417+
script:
418418
- cd dashboard
419419
- yarn install
420420
- yarn build
@@ -424,7 +424,7 @@ pages:
424424
rules:
425425
- if: $CI_PIPELINE_SOURCE == "web" && $DEPLOY_PAGES == "true"
426426
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && "$CI_COMMIT_REF_NAME" == "$CI_DEFAULT_BRANCH"
427-
changes:
427+
changes:
428428
- dashboard/**/*
429429
artifacts:
430430
paths:

0 commit comments

Comments
 (0)