From 943537f0199c2d6ff98ef6b6ed86a77b64eaa6d8 Mon Sep 17 00:00:00 2001 From: Timo Beller Date: Wed, 13 Jul 2022 17:25:04 +0200 Subject: [PATCH] feat(license): Kein Verzeichniswechsel, suche BOM-File in Standardpfaden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bei (bedingtem) Verzeichnis wären absolute Dateipfade sinnvoll, damit der Artefact-Export funktioniert. Ein Verzeichniswechsel scheint aber garnicht notwendig zu sein, wenn die BOM-Datei korrekt/absolut angegeben ist. --- templates/license/license.gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/license/license.gitlab-ci.yml b/templates/license/license.gitlab-ci.yml index 7ce5190..7ef0aa5 100644 --- a/templates/license/license.gitlab-ci.yml +++ b/templates/license/license.gitlab-ci.yml @@ -8,9 +8,15 @@ INVALID_LICENSE_ADOC_FILE: invalid-licenses.adoc NUMBER_OF_ALLOWED_FAILURES: 0 script: + # If bom-file does not exist, search for it in default-maven directory - > - if [ "$BACKEND_DIR" != "" ]; then - cd $BACKEND_DIR + if [[ ! -f "$BOM_FILE" && -f "$BACKEND_DIR/target/bom.json" ]]; then + export BOM_FILE=$BACKEND_DIR/target/bom.json + fi + # If bom-file does not exist, search for it in default-gradle directory + - > + if [[ ! -f "$BOM_FILE" && -f "$BACKEND_DIR/build/reports/bom.json" ]]; then + export BOM_FILE=$BACKEND_DIR/build/reports/bom.json fi - export NUMBER_OF_INVALID_LICENSES=0 - export INVALID_BOM_FILE=invalid-bom.json