fix: detect prerelease tags of the checked out commit

The default end tag was determined by listing all tags and filtering out prereleases. As a result the currently built
prerelease tag was never evaluated and the changelog was generated for the previous stable release instead. The end tag
is now the tag of the checked out commit, so the prerelease annotation is set as expected. Prerelease filtering remains
in place for the start tag only. Additionally the changelog is no longer skipped for prereleases, since consumers of the
chart benefit from the changes list before the stable release.

Co-authored-by: Copilot <copilot@github.com>

.gitea/workflows/auto-release.yaml

@@ -0,0 +1,70 @@
+name: Auto release tagged
+
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+    - install-yq.sh
+
+env:
+  GIT_EMAIL: noreply@cryptic.systems
+  GIT_USER: CSRBot
+
+jobs:
+  tag_on_change:
+    permissions:
+      actions: write
+      contents: write
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
+        with:
+          fetch-depth: 0
+
+      - name: Check if DC_VERSION line changed
+        id: check_change
+        run: |
+          echo "changed=false" >> $GITHUB_OUTPUT
+
+          for file in install-yq.sh; do
+            if git diff HEAD~1 HEAD -- "${file}" | grep --quiet '^[+-]internal_yq_version'; then
+              echo "internal_yq_version line changed."
+              echo "changed=true" >> $GITHUB_OUTPUT
+              break
+            fi
+          done
+
+      - name: Stop if no change detected
+        if: steps.check_change.outputs.changed == 'false'
+        run: echo "No internal_yq_version change. Exiting..."
+
+      - name: Get latest tag
+        if: steps.check_change.outputs.changed == 'true'
+        id: get_tag
+        run: |
+          latest_tag=$(git tag --sort=-v:refname | grep --extended-regexp '^v[0-9]+\.[0-9]+\.[0-9]+$' | head --lines 1 || echo "v0.0.0")
+          echo "latest_tag=$latest_tag" >> $GITHUB_OUTPUT
+          echo "Latest tag: $latest_tag"
+
+      - name: Increment patch version
+        if: steps.check_change.outputs.changed == 'true'
+        id: bump
+        run: |
+          latest_tag="${{ steps.get_tag.outputs.latest_tag }}"
+          IFS='.' read -r major minor patch <<< "${latest_tag#v}"
+          patch=$((patch + 1))
+          new_tag="v${major}.${minor}.${patch}"
+          echo "new_tag=$new_tag" >> $GITHUB_OUTPUT
+          echo "New tag: $new_tag"
+
+      - name: Create and push new tag
+        if: steps.check_change.outputs.changed == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          new_tag=${{ steps.bump.outputs.new_tag }}
+          git config --local user.name "${GIT_USER}"
+          git config --local user.email "${GIT_EMAIL}"
+          git tag -a "${new_tag}" -m "${new_tag}"
+          git push origin "${new_tag}"

.gitea/workflows/install-yq.yaml

@@ -38,6 +38,6 @@ jobs:
           YQ_ARCH: ${{ matrix.yq-arch }}
           YQ_BINARY_NAME: ${{ inputs.yq-binary-name }}
           YQ_DOWNLOAD_URL: ${{ inputs.yq-download-url }}
-          YQ_OS: ${{ matrix .yq-os }}
+          YQ_OS: ${{ matrix.yq-os }}
           YQ_VERSION: ${{ inputs.yq-version }}
         run: ./install-yq.sh

.gitea/workflows/markdown-linters.yaml

@@ -13,7 +13,7 @@ on:
 jobs:
   markdown-link-checker:
     container:
-      image: docker.io/library/node:26.7.0-alpine
+      image: docker.io/library/node:26.8.2-alpine
     runs-on: ubuntu-latest
     steps:
     - name: Install tooling
@@ -28,7 +28,7 @@ jobs:
 
   markdown-lint:
     container:
-      image: docker.io/library/node:26.7.0-alpine
+      image: docker.io/library/node:26.8.2-alpine
     runs-on: ubuntu-latest
     steps:
     - name: Install tooling

README.md

@@ -1,23 +1,26 @@
 # ah-annotation
 
-GitHub Action to generate ArtifactHub changelog annotations from Git commit history and add them to `Chart.yaml`.
+GitHub Action to generate [ArtifactHub
+annotations](https://artifacthub.io/docs/topics/annotations/helm/#supported-annotations) from Git commit history and add
+them to `Chart.yaml`.
 
 The action parses conventional commit messages between two Git tags and produces an `artifacthub.io/changes` annotation.
-Pre-release tags (matching `-rc`) are detected automatically and result in an `artifacthub.io/prerelease` annotation
+Pre-release tags according to [SemVer 2.0](https://semver.org/) (e.g. `-alpha`, `-beta.1`, `-rc.2`) are detected
-instead.
+automatically and additionally result in an `artifacthub.io/prerelease` annotation.
 
 ## Usage
 
 ### Auto-detect tags
 
-Without explicit inputs the action determines the two most recent non-RC tags from the Git history:
+Without explicit inputs the action uses the currently checked out tag as end tag and the most recent stable
+(non-pre-release) tag as start tag:
 
 ```yaml
 steps:
   - uses: actions/checkout@v7.0.1
     with:
       fetch-depth: 0
-  - uses: volker.raschek/ah-annotations@v0.0.1
+  - uses: volker.raschek/ah-annotations@v0.2.2
 ```
 
 ### Explicit tags
@@ -29,7 +32,7 @@ steps:
   - uses: actions/checkout@v7.0.1
     with:
       fetch-depth: 0
-  - uses: volker.raschek/ah-annotations@v0.0.1
+  - uses: volker.raschek/ah-annotations@v0.2.2
     with:
       old-tag: v1.0.0
       new-tag: v2.0.0
@@ -37,17 +40,32 @@ steps:
 
 ## Inputs
 
-| Name      | Required | Default       | Description                          |
+| Name               | Required | Default                              | Description                                |
-| --------- | -------- | ------------- | ------------------------------------ |
+| ------------------ | -------- | ------------------------------------ | ------------------------------------------ |
-| `old-tag` | no       | auto-detected | Start tag for changelog generation.  |
+| `chart-path`       | no       | `${{ github.workspace }}/Chart.yaml` | Path to the Helm chart file.               |
-| `new-tag` | no       | auto-detected | End tag for changelog generation.    |
+| `old-tag`          | no       | auto-detected                        | Start tag for changelog generation.        |
+| `new-tag`          | no       | auto-detected                        | End tag for changelog generation.          |
+| `yq-version`       | no       | `v4.53.6`                            | Version of yq to install.                  |
+| `yq-arch`          | no       | auto-detected                        | Architecture of yq binary to download.     |
+| `yq-os`            | no       | auto-detected                        | Operating system of yq binary to download. |
+| `yq-binary-name`   | no       | `yq`                                 | Name of the yq binary to download.         |
+| `yq-download-url`  | no       | auto-built                           | Full URL to download yq from.              |
 
 ## Requirements
 
 - The repository must be checked out with full history (`fetch-depth: 0`).
-- A `Chart.yaml` file must exist in the working directory.
+- A `Chart.yaml` file must exist at the path specified by `chart-path`.
 - Commit messages must follow the [Conventional Commits](https://www.conventionalcommits.org/) format.
 
+## Pre-releases
+
+Tags containing a hyphen-separated pre-release identifier according to [SemVer 2.0](https://semver.org/) are treated as
+pre-releases (e.g. `v1.0.0-alpha`, `v1.0.0-beta.1`, `v2.0.0-rc.2`). When `new-tag` is a pre-release tag, the action sets
+`artifacthub.io/prerelease: "true"` in `Chart.yaml` in addition to the generated changelog.
+
+When auto-detecting tags (no explicit `old-tag`/`new-tag`), the end tag is the tag of the checked out commit - including
+pre-releases - while the start tag is always the most recent stable tag.
+
 ## Commit type mapping
 
 | Commit type                                      | ArtifactHub kind |

action.yaml

@@ -2,6 +2,10 @@ name: "ArtifactHub Annotations"
 description: "Generate ArtifactHub changelog annotations from git commit history and add them to Chart.yaml"
 
 inputs:
+  chart-path:
+    description: "Path to the Helm chart file"
+    default: "${{ github.workspace }}/Chart.yaml"
+    required: false
   old-tag:
     description: "Start tag for changelog generation. If not set, auto-detected from git tags."
     required: false
@@ -31,7 +35,7 @@ inputs:
   yq-version:
     description: "Version of yq to install"
     required: false
-    default: "v4.44.6"
+    default: "v4.53.6" # renovate: datasource=github-releases depName=mikefarah/yq versioning=semver
 
 runs:
   using: "composite"
@@ -49,7 +53,7 @@ runs:
     - name: Add ArtifactHub annotations
       shell: bash
       env:
+        CHART_FILE: ${{ inputs.chart-path }}
         INPUT_OLD_TAG: ${{ inputs.old-tag }}
         INPUT_NEW_TAG: ${{ inputs.new-tag }}
       run: "${GITHUB_ACTION_PATH}/add-annotations.sh"
-

add-annotations.sh

@@ -6,8 +6,8 @@
 
 set -euo pipefail
 
-readonly CHART_FILE="Chart.yaml"
+readonly CHART_FILE="${CHART_FILE:="Chart.yaml"}"
-readonly RC_PATTERN="\-rc([-\.][0-9]+)?$"
+readonly PRERELEASE_PATTERN="\-[a-zA-Z0-9]+([-\.][a-zA-Z0-9]+)*$"
 
 CHANGE_LOG_YAML=""
 
@@ -23,9 +23,10 @@ if [[ ! -f "${CHART_FILE}" ]]; then
   exit 1
 fi
 
-# Determine old and new tags
+# Determine old and new tags. The new tag is the currently checked out one - including prereleases - so that
-DEFAULT_NEW_TAG="$(git tag --sort=-version:refname | grep --invert-match --perl-regexp "${RC_PATTERN}" | head --lines 1)"
+# prereleases are detected. Only the old tag is restricted to stable releases.
-DEFAULT_OLD_TAG="$(git tag --sort=-version:refname | grep --invert-match --perl-regexp "${RC_PATTERN}" | head --lines 2 | tail --lines 1)"
+DEFAULT_NEW_TAG="$(git describe --tags --exact-match HEAD 2>/dev/null || git tag --sort=-version:refname | head --lines 1)"
+DEFAULT_OLD_TAG="$(git tag --sort=-version:refname | grep --invert-match --perl-regexp "${PRERELEASE_PATTERN}" | head --lines 2 | tail --lines 1)"
 
 if [[ -n "${INPUT_OLD_TAG:-}" ]]; then
   OLD_TAG="${INPUT_OLD_TAG}"
@@ -49,10 +50,8 @@ if [[ -z "$(git tag --list "${NEW_TAG}")" ]]; then
   exit 1
 fi
 
-if [[ "${NEW_TAG}" =~ ${RC_PATTERN} ]]; then
+if [[ "${NEW_TAG}" =~ ${PRERELEASE_PATTERN} ]]; then
-  echo "INFO: Tag '${NEW_TAG}' is a prerelease, setting prerelease annotation and skipping changelog."
   yq --no-colors --inplace ".annotations.\"artifacthub.io/prerelease\" = \"true\" | sort_keys(.)" "${CHART_FILE}"
-  exit 0
 fi
 
 CHANGE_LOG_YAML="$(mktemp)"

install-yq.sh

@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-internal_yq_version=v4.44.6 # renovate: datasource=github-releases depName=mikefarah/yq versioning=semver
+internal_yq_version=v4.53.6 # renovate: datasource=github-releases depName=mikefarah/yq versioning=semver
 
 # Use :- for unset and handle empty strings from composite action inputs
 YQ_BINARY_NAME="${YQ_BINARY_NAME:="yq"}"
@@ -14,7 +14,7 @@ YQ_VERSION="${YQ_VERSION:="${internal_yq_version}"}"
 case "${YQ_OS:-}" in
   linux*)     ;;
   darwin*)    ;;
-  *)          echo "Unsupported OS: $(uname -s)"; exit 1;;
+  *)          echo "ERROR: Unsupported OS: $(uname -s)"; exit 1;;
 esac
 
 
@@ -22,7 +22,7 @@ esac
 case "${YQ_ARCH:-}" in
   amd64*  | x86_64*)  YQ_ARCH="amd64" ;;
   aarch64 | arm64*)     YQ_ARCH="arm64" ;;
-  *)          echo "Unsupported architecture: $(uname -m)"; exit 1;;
+  *)          echo "ERROR: Unsupported architecture: $(uname -m)"; exit 1;;
 esac
 
 # Build download URL if not explicitly provided
@@ -41,7 +41,7 @@ fi
 
 # Download and extract yq binary from .tar.gz
 if [[ "${YQ_DOWNLOAD_URL}" =~ \.tar\.gz$ ]]; then
-  echo "Downloading and extracting yq from ${YQ_DOWNLOAD_URL}..."
+  echo "INFO: Downloading and extracting yq from ${YQ_DOWNLOAD_URL}..."
   tmp_dir="$(mktemp -d)"
   trap 'rm -rf "${tmp_dir}"' EXIT
 
@@ -61,7 +61,7 @@ if [[ "${YQ_DOWNLOAD_URL}" =~ \.tar\.gz$ ]]; then
 
 # Download yq binary directly
 else
-  echo "Downloading yq from ${YQ_DOWNLOAD_URL}..."
+  echo "INFO: Downloading yq from ${YQ_DOWNLOAD_URL}..."
 
   curl \
     --fail \
@@ -74,9 +74,9 @@ fi
 chmod +x "${bin_path}"
 
 yq_installed_version="$("${bin_path}" --version)"
-echo "Installed ${yq_installed_version} in ${bin_path}"
+echo "INFO: Installed ${yq_installed_version} in ${bin_path}"
 
 # Ensure yq is in PATH for subsequent steps
 if [[ -n "${GITHUB_PATH:-}" ]]; then
-  echo "$(dirname "${bin_path}")" >> "${GITHUB_PATH}"
+  dirname "${bin_path}" >> "${GITHUB_PATH}"
 fi

renovate.json

@@ -31,9 +31,34 @@
       "depNameTemplate": "actions/checkout",
       "datasourceTemplate": "github-releases",
       "versioningTemplate": "semver"
+    },
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^README\\.md$"
+      ],
+      "matchStrings": [
+        "yq-version.[ \\t]+\\|[ \\t]+no[ \\t]+\\|[ \\t]+.(?<currentValue>v[\\d]+\\.[\\d]+\\.[\\d]+)"
+      ],
+      "depNameTemplate": "mikefarah/yq",
+      "datasourceTemplate": "github-releases",
+      "versioningTemplate": "semver"
     }
   ],
   "packageRules": [
+    {
+      "addLabels": [
+        "renovate/automerge"
+      ],
+      "automerge": true,
+      "matchDepNames": [
+        "mikefarah/yq"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
+    },
     {
       "addLabels": [
         "renovate/automerge",