chore(ci): cleanup scripts

.gitea/scripts/add-annotations.sh

@@ -4,13 +4,12 @@ set -e
 
 CHART_FILE="Chart.yaml"
 if [ ! -f "${CHART_FILE}" ]; then
-  echo "ERROR: ${CHART_FILE} not found!"
+  echo "ERROR: ${CHART_FILE} not found!" 1>&2
   exit 1
 fi
 
-
+DEFAULT_NEW_TAG="$(git tag --sort=-version:refname | head -n 1)"
-DEFAULT_NEW_TAG="$(git describe --abbrev=0)"
+DEFAULT_OLD_TAG="$(git tag --sort=-version:refname | head -n 2 | tail -n 1)"
-DEFAULT_OLD_TAG="$(git describe --abbrev=0 --tags "$(git rev-list --tags --skip=1 --max-count=1)")"
 
 if [ -z "${1}" ]; then
   read -p "Enter start tag [${DEFAULT_OLD_TAG}]: " OLD_TAG
@@ -19,7 +18,7 @@ if [ -z "${1}" ]; then
   fi
 
   while [ -z "$(git tag --list "${OLD_TAG}")" ]; do
-    echo "ERROR: Tag '${OLD_TAG}' not found!"
+    echo "ERROR: Tag '${OLD_TAG}' not found!" 1>&2
     read -p "Enter start tag [${DEFAULT_OLD_TAG}]: " OLD_TAG
     if [ -z "${OLD_TAG}" ]; then
       OLD_TAG="${DEFAULT_OLD_TAG}"
@@ -28,29 +27,29 @@ if [ -z "${1}" ]; then
 else
   OLD_TAG=${1}
   if [ -z "$(git tag --list "${OLD_TAG}")" ]; then
-    echo "ERROR: Tag '${OLD_TAG}' not found!"
+    echo "ERROR: Tag '${OLD_TAG}' not found!" 1>&2
     exit 1
   fi
 fi
 
-if [ -z "${1}" ]; then
+if [ -z "${2}" ]; then
   read -p "Enter end tag [${DEFAULT_NEW_TAG}]: " NEW_TAG
   if [ -z "${NEW_TAG}" ]; then
     NEW_TAG="${DEFAULT_NEW_TAG}"
   fi
 
   while [ -z "$(git tag --list "${NEW_TAG}")" ]; do
-    echo "ERROR: Tag '${NEW_TAG}' not found!"
+    echo "ERROR: Tag '${NEW_TAG}' not found!" 1>&2
     read -p "Enter end tag [${DEFAULT_NEW_TAG}]: " NEW_TAG
     if [ -z "${NEW_TAG}" ]; then
       NEW_TAG="${DEFAULT_NEW_TAG}"
     fi
   done
 else
-  NEW_TAG=${1}
+  NEW_TAG=${2}
 
   if [ -z "$(git tag --list "${NEW_TAG}")" ]; then
-    echo "ERROR: Tag '${NEW_TAG}' not found!"
+    echo "ERROR: Tag '${NEW_TAG}' not found!" 1>&2
     exit 1
   fi
 fi
@@ -80,7 +79,9 @@ function map_type_to_kind() {
   esac
 }
 
-COMMIT_TITLES=$(git log "${OLD_TAG}..${NEW_TAG}" --pretty=format:"%s")
+COMMIT_TITLES="$(git log --pretty=format:"%s" "${OLD_TAG}..${NEW_TAG}")"
+
+echo "INFO: Generate change log entries from ${OLD_TAG} until ${NEW_TAG}"
 
 while IFS= read -r line; do
   if [[ "${line}" =~ ^([a-zA-Z]+)(\([^\)]+\))?\:\ (.+)$ ]]; then
@@ -93,11 +94,17 @@ while IFS= read -r line; do
     DESC="${BASH_REMATCH[3]}"
     KIND=$(map_type_to_kind "${TYPE}")
 
+    echo "- ${KIND}: ${DESC}"
+
     yq --inplace ". += [ {\"kind\": \"${KIND}\", \"description\": \"${DESC}\"}]" "${YAML_FILE}"
   fi
 done <<< "${COMMIT_TITLES}"
 
+if [ -s "${YAML_FILE}" ]; then
   yq --no-colors --inplace ".annotations.\"artifacthub.io/changes\" |= loadstr(\"${YAML_FILE}\") | sort_keys(.)" "${CHART_FILE}"
-yq --no-colors --inplace ".version = \"${NEW_TAG}\"" "${CHART_FILE}"
+else
+  echo "ERROR: Changelog file is empty: ${YAML_FILE}" 1>&2
+  exit 1
+fi
 
 rm "${YAML_FILE}"

.gitea/workflows/release.yaml

@@ -15,19 +15,16 @@ jobs:
         run: |
           apk update
           apk add git npm yq
+
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Add Artifacthub.io annotations
         run: |
-          NEW_TAG="$(git describe --abbrev=0)"
+          NEW_TAG="$(git tag --sort=-version:refname | head -n 1)"
-          OLD_TAG="$(git describe --abbrev=0 --tags "$(git rev-list --tags --skip=1 --max-count=1)")"
+          OLD_TAG="$(git tag --sort=-version:refname | head -n 2 | tail -n 1)"
-
+          .gitea/scripts/add-annotations.sh "${OLD_TAG}" "${NEW_TAG}"
-          echo "${NEW_TAG}"
-          echo "${OLD_TAG}"
-
-          .gitea/scripts/add-annotations.sh "${NEW_TAG}" "${OLD_TAG}"
 
       - name: Package chart
         env:

Chart.yaml

@@ -4,21 +4,6 @@ annotations:
       url: https://git.cryptic.systems/volker.raschek/prometheus-fail2ban-exporter
     - name: support
       url: https://git.cryptic.systems/volker.raschek/prometheus-fail2ban-exporter-charts/issues
-  artifacthub.io/changes: |
-    - kind: changed
-      description: use short flags of cut
-    - kind: added
-      description: support Artifacthub annotations
-    - kind: changed
-      description: update volkerraschek/helm docker tag to v3.18.2
-    - kind: changed
-      description: update docker.io/volkerraschek/helm docker tag to v3.18.2
-    - kind: changed
-      description: update dependency volker.raschek/prometheus-fail2ban-exporter-charts to v0.4.0
-    - kind: changed
-      description: update volkerraschek/helm docker tag to v3.18.1
-    - kind: changed
-      description: update docker.io/volkerraschek/helm docker tag to v3.18.1
 apiVersion: v2
 appVersion: "0.1.1"
 description: Prometheus metric exporter for Fail2Ban

README.md

@@ -42,7 +42,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-CHART_VERSION=0.4.0
+CHART_VERSION=0.4.11
 helm show values prometheus-exporters/prometheus-fail2ban-exporter --version "${CHART_VERSION}" > values.yaml
 ```