From 5775848b0f697745c960add04ec8ee8ef8e98e8b Mon Sep 17 00:00:00 2001 From: Wolfram Gulde Date: Tue, 31 May 2022 15:20:07 +0200 Subject: [PATCH] docs(exx-Pipeline): fix typo in variable 4 --- templates/license/license.gitlab-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/templates/license/license.gitlab-ci.yml b/templates/license/license.gitlab-ci.yml index 74477bd..1b2f665 100644 --- a/templates/license/license.gitlab-ci.yml +++ b/templates/license/license.gitlab-ci.yml @@ -11,18 +11,17 @@ - export NUMBER_OF_INVALID_LICENSES=0 - export INVALID_BOM_FILE=invalid-bom.json - > - if [ -f "$ALLOWED_LICENCES" ]; then + if [ -f "$ALLOWED_LICENSES" ]; then checkLicenseBom --bom $BOM_FILE --targetBom $INVALID_BOM_FILE --license $ALLOWED_LICENSES || NUMBER_OF_INVALID_LICENSES=$? - echo "Number of invalid license ${NUMBER_OF_INVALID_LICENSES}" - checkLicenseBom --bom $BOM_FILE --targetBom $INVALID_BOM_FILE --license $ALLOWED_LICENSES fi -# - > -# if [ "$NUMBER_OF_INVALID_LICENSES" -gt 0 ]; then -# licenseBom2Adoc --bom $INVALID_BOM_FILE --adoc $INVALID_LICENSE_ADOC_FILE -# exit 1 -# else -# echo "All licenses valid" -# fi + - > + if [ "$NUMBER_OF_INVALID_LICENSES" -gt 0 ]; then + echo "Invalid licenses found. Number of invalid license ${NUMBER_OF_INVALID_LICENSES}". See invalid-licenses file in artifacts. + licenseBom2Adoc --bom $INVALID_BOM_FILE --adoc $INVALID_LICENSE_ADOC_FILE + exit 1 + else + echo "All licenses valid" + fi - licenseBom2Adoc --bom $BOM_FILE --adoc $LICENSE_ADOC_FILE artifacts: when: always