From a08f077731a04f95f55949c6f57f1272dc6ee8f0 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Fri, 30 May 2025 13:07:29 +0200
Subject: [PATCH] Forgot version
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.gitlab/gen-badge.sh | 15 ++++++++++++---
install.sh | 1 +
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.gitlab/gen-badge.sh b/.gitlab/gen-badge.sh
index 4124b388d7..b6a3f6da45 100644
--- a/.gitlab/gen-badge.sh
+++ b/.gitlab/gen-badge.sh
@@ -1,15 +1,24 @@
#!/bin/bash
anybadge --label pipeline --value "passed" failed=red passed=green canceled=darkgray > "./final/${DOC_VERSION}/images/pipeline.svg"
-PIPELINE_COVERAGE=$(curl -fsSL -H "PRIVATE-TOKEN: ${CI_TOKEN}" "${GITLAB_URL}/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines/latest?ref=${CI_COMMIT_BRANCH}" | jq --raw-output .coverage)
+URL = "${GITLAB_URL}/api/v4/projects/${GITLAB_PROJECT_ID}/pipelines/latest?ref=${CI_COMMIT_BRANCH}"
+echo "[DEBUG] obtaining pipeline coverage from url: $URL ..."
+PIPELINE_COVERAGE=$(curl -fsSL -H "PRIVATE-TOKEN: ${CI_TOKEN}" $URL | jq --raw-output .coverage)
echo "[INFO] pipeline coverage: ${PIPELINE_COVERAGE}"
+
if [ "${PIPELINE_COVERAGE}" != "null" ]; then
anybadge --label coverage --value "${PIPELINE_COVERAGE}" coverage > "./final/${DOC_VERSION}/images/coverage.svg"
else
echo "[WARNING] Skipping badge generation, displaying default badge text: unknown"
fi
-curl -fsSL "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=sqale_rating&token=${CI_SONAR_BADGE_TOKEN}" > "./final/${DOC_VERSION}/images/maintainability.svg"
-curl -fsSL "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=security_rating&token=${CI_SONAR_BADGE_TOKEN}" > "./final/${DOC_VERSION}/images/security.svg"
+
+URL = "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=sqale_rating&token=${CI_SONAR_BADGE_TOKEN}"
+echo "[DEBUG] obtain maintainability project badge from url: $URL ..."
+curl -fsSL $URL > "./final/${DOC_VERSION}/images/maintainability.svg"
+
+URL = "${CI_SONAR_URL}/api/project_badges/measure?project=${CI_SONAR_PROJECT_KEY}&metric=security_rating&token=${CI_SONAR_BADGE_TOKEN}"
+echo "[DEBUG] obtain security project badge from url: $URL ..."
+curl -fsSL $URL > "./final/${DOC_VERSION}/images/security.svg"
echo "[INFO] retrieved badges"
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 66c27fbfc7..1b7b3070cb 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# preset
+APP_VERSION="1.9"
MIN_CPU=8
MIN_RAM=10
SKIP_CHECKS=${SKIP_CHECKS:-0}
--
GitLab