fix(bump): Schutz vor Doppel-Tags nur für Tags derselben Art (#5)

Der Schutz „Commit trägt schon ein v-Tag, nichts tun“ zählt jetzt nur Tags derselben Art (dev, beta, stabil). Vorher hätte ein dev-Tag nach einem Fast-Forward-Merge in `release/*` das Beta-Tag und damit Build und Deploy nach beta verhindert.

Getestet im lokalen Harness: Feature vom Release-Head taggen, Fast-Forward nach `release/2.4`, Lauf auf release ergibt `v2.4.1-beta.2` auf demselben Commit; erneuter Lauf tut nichts. Release als `bump-v2.0.1`.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Reviewed-on: #5

.woodpecker/plugins.yaml

@@ -0,0 +1,60 @@
+# Builds the plugins in woodpecker/<name>/. A tag <name>-vX.Y.Z pushes
+# git.uesome.de/actions/ci-cd/<name>:vX.Y.Z; pushes and PRs only test the build.
+when:
+  - event: [push, pull_request]
+    path: 'woodpecker/**'
+  - event: tag
+    ref: [refs/tags/deploy-v*, refs/tags/bump-v*]
+
+steps:
+  - name: deploy-plugin-check
+    image: woodpeckerci/plugin-docker-buildx:6
+    settings:
+      repo: git.uesome.de/actions/ci-cd/deploy
+      context: woodpecker/deploy
+      dockerfile: woodpecker/deploy/Dockerfile
+      dry_run: true
+    when:
+      event: [push, pull_request]
+      path: 'woodpecker/deploy/**'
+
+  - name: deploy-plugin
+    image: woodpeckerci/plugin-docker-buildx:6
+    settings:
+      registry: git.uesome.de
+      repo: git.uesome.de/actions/ci-cd/deploy
+      context: woodpecker/deploy
+      dockerfile: woodpecker/deploy/Dockerfile
+      tags: ${CI_COMMIT_TAG##deploy-}
+      username: oumta-ci
+      password:
+        from_secret: oumta_ci_token
+    when:
+      event: tag
+      ref: refs/tags/deploy-v*
+
+  - name: bump-plugin-check
+    image: woodpeckerci/plugin-docker-buildx:6
+    settings:
+      repo: git.uesome.de/actions/ci-cd/bump
+      context: woodpecker/bump
+      dockerfile: woodpecker/bump/Dockerfile
+      dry_run: true
+    when:
+      event: [push, pull_request]
+      path: 'woodpecker/bump/**'
+
+  - name: bump-plugin
+    image: woodpeckerci/plugin-docker-buildx:6
+    settings:
+      registry: git.uesome.de
+      repo: git.uesome.de/actions/ci-cd/bump
+      context: woodpecker/bump
+      dockerfile: woodpecker/bump/Dockerfile
+      tags: ${CI_COMMIT_TAG##bump-}
+      username: oumta-ci
+      password:
+        from_secret: oumta_ci_token
+    when:
+      event: tag
+      ref: refs/tags/bump-v*

README.md

@@ -117,3 +117,93 @@ jobs:
           kubeconfig: ${{ secrets.KUBECONFIG }}
           registry: ${{ secrets.REGISTRY }}
 ```
+
+## Woodpecker plugins
+
+Plugins are Docker images built from `woodpecker/<name>/` by `.woodpecker/plugins.yaml`. A tag `<name>-vX.Y.Z` publishes `git.uesome.de/actions/ci-cd/<name>:vX.Y.Z`; pipelines pin that version. The push uses `oumta-ci` with the Woodpecker secret `oumta_ci_token`, so `oumta-ci` needs package write access in the org `actions`.
+
+The secret `oumta_ci_token` holds the one token `oumta-ci` writes with. Limit it in Woodpecker to the images `woodpeckerci/plugin-docker-buildx:6`, `git.uesome.de/actions/ci-cd/bump` and `git.uesome.de/actions/ci-cd/deploy` and to the events `push`, `tag` and `manual` (zugaenge.md in oumta-deploy).
+
+### deploy
+
+Writes a pushed dev or beta image with its digest to `tanztee/oumta-deploy` (D16 there). `ci/deploy-image.sh` in oumta-deploy decides the environment from the tag: `-dev.` goes to dev, `-beta.` to beta, anything else is skipped (prod only via PR).
+
+Settings:
+
+- `var` (required): variable in `envs/<env>/images.env`, e.g. `AUTH_IMAGE`. `{major}` is replaced by the major of the tag (`APP_V{major}_IMAGE` -> `APP_V2_IMAGE`).
+- `deploy_token` (required): token of `oumta-ci` (`oumta_ci_token`), write access to oumta-deploy
+- `registry_username`, `registry_password`: read access to the registry for the digest (`oumta-ci` with the same token)
+- `envs`: fixed environments instead of the tag rule, e.g. `dev beta` (oumta-keyklo)
+- `tag`: default `CI_COMMIT_TAG`
+- `registry`: default `git.uesome.de`
+- `image`: default `<registry>/<CI_REPO>`
+- `deploy_user`: default `oumta-ci`
+- `deploy_repo`: default `https://git.uesome.de/tanztee/oumta-deploy.git`
+
+Example:
+
+```yaml
+when:
+  event: tag
+  ref: refs/tags/v*
+
+steps:
+  - name: build
+    image: woodpeckerci/plugin-docker-buildx:6
+    settings:
+      registry: git.uesome.de
+      repo: git.uesome.de/tanztee/oumta-auth
+      tags: ${CI_COMMIT_TAG}
+      build_args:
+        VERSION: ${CI_COMMIT_TAG##v}
+      username: oumta-ci
+      password:
+        from_secret: oumta_ci_token
+
+  - name: deploy
+    image: git.uesome.de/actions/ci-cd/deploy:v1.0.0
+    settings:
+      var: AUTH_IMAGE
+      registry_username: oumta-ci
+      registry_password:
+        from_secret: oumta_ci_token
+      deploy_token:
+        from_secret: oumta_ci_token
+```
+
+### bump
+
+Derives the next version for the pushed branch and pushes it as a tag on the triggering commit. There is no version commit: the build takes the version from the tag (`CI_COMMIT_TAG`, e.g. as build arg `VERSION: ${CI_COMMIT_TAG##v}`), `package.json` stays untouched. The tag event then starts the build.
+
+- `release/X.Y[.Z]`, `hotfix/X.Y.Z`: next `vX.Y.Z-beta.N` of that line (D8). A hotfix needs a patch number.
+- `production/*`: no bump, the step fails. A release is a retag of a beta image (D9).
+- the branch in `release_branch` (repos without majors, e.g. oumta-keyklo `main`): next stable `vX.Y.Z`, the highest existing patch of the line plus one
+- any other branch: `vX.Y.Z-dev.<UTC timestamp>`; the line comes from `release_line`, the branch name, the nearest `release/*` or `hotfix/*` branch (newest merge base), or `major.minor` from `package.json`
+
+If the stable tag of a line exists (`v2.4.0` after the release), the next patch of that line is used (`v2.4.1-beta.0`, `v2.4.1-dev.…`).
+
+Only the commit that triggered the pipeline is tagged; if the branch moved on, the step exits without a tag and the newer pipeline takes over. A commit that already carries a tag of the same kind (dev, beta or stable) is not tagged again, so a re-run does not build twice; a dev tag does not block the beta tag after a fast-forward merge.
+
+Settings:
+
+- `git_token` (required): token of `oumta-ci` (`oumta_ci_token`), write access to the repo
+- `git_user`: default `oumta-ci`
+- `release_branch`: optional, branch that gets stable tags instead of dev tags
+- `release_line`: optional, `<major>.<minor>[.<patch>]`, overrides every other rule
+- `remote`: default `CI_REPO_CLONE_URL`
+
+Example:
+
+```yaml
+when:
+  - event: push
+    branch: ['feature/**', 'release/**', 'hotfix/**']
+  - event: manual
+
+steps:
+  - name: bump
+    image: git.uesome.de/actions/ci-cd/bump:v2.0.0
+    settings:
+      git_token:
+        from_secret: oumta_ci_token
+```

woodpecker/bump/Dockerfile

@@ -0,0 +1,5 @@
+# Woodpecker plugin: derives the next version and pushes it as a tag
+FROM alpine:3.20
+RUN apk add --no-cache bash git ca-certificates
+COPY bump.sh /usr/local/bin/bump.sh
+ENTRYPOINT ["/usr/local/bin/bump.sh"]

woodpecker/bump/bump.sh

@@ -0,0 +1,166 @@
+#!/usr/bin/env bash
+# Woodpecker plugin "bump": derives the next version for the pushed branch and
+# pushes it as a tag on the triggering commit. No commit is made; the build
+# takes the version from the tag (CI_COMMIT_TAG). The tag event then starts
+# the build.
+#
+#   release/X.Y[.Z], hotfix/X.Y.Z   next vX.Y.Z-beta.N (D8)
+#   production/*                    nothing: releases are retags (D9)
+#   settings.release_branch         next free vX.Y.Z (repos without majors)
+#   any other branch                vX.Y.Z-dev.<UTC timestamp>
+set -euo pipefail
+
+die() { echo "bump: $*" >&2; exit 1; }
+
+BRANCH=${CI_COMMIT_BRANCH:?CI_COMMIT_BRANCH is missing (push event only)}
+SHA=${CI_COMMIT_SHA:?CI_COMMIT_SHA is missing}
+REMOTE=${PLUGIN_REMOTE:-${CI_REPO_CLONE_URL:?CI_REPO_CLONE_URL is missing}}
+GIT_USER=${PLUGIN_GIT_USER:-oumta-ci}
+RELEASE_LINE=${PLUGIN_RELEASE_LINE:-}
+RELEASE_BRANCH=${PLUGIN_RELEASE_BRANCH:-}
+[[ -n ${PLUGIN_GIT_TOKEN:-} ]] || die "settings.git_token is missing"
+
+case $BRANCH in
+  production/*) die "no bump on $BRANCH: a release is a retag of a beta image (D9)" ;;
+esac
+
+# Token only via credential helper, never in a URL or config, so no log shows it
+export GIT_USER PLUGIN_GIT_TOKEN
+git config --global --add safe.directory "$PWD"
+git config credential.helper '!f() { echo "username=$GIT_USER"; echo "password=$PLUGIN_GIT_TOKEN"; }; f'
+git remote set-url origin "$REMOTE"
+
+# The Woodpecker clone is shallow and has no tags; the version rules need both.
+if [[ $(git rev-parse --is-shallow-repository) == true ]]; then
+  git fetch --quiet --unshallow origin
+fi
+git fetch --quiet --tags --force origin "+refs/heads/*:refs/remotes/origin/*"
+
+# Tag exactly the commit that triggered the pipeline. A newer push on the
+# branch starts its own pipeline, so this one steps aside.
+head=$(git rev-parse -q --verify "origin/$BRANCH") || die "$BRANCH no longer exists on origin"
+if [[ $head != "$SHA" ]]; then
+  echo "bump: $BRANCH moved past ${SHA:0:8}, the newer pipeline bumps"
+  exit 0
+fi
+git checkout --quiet "$SHA"
+
+tag_exists() { git rev-parse -q --verify "refs/tags/v$1" >/dev/null; }
+
+# "2.4" or "v2.4.1" -> "2.4.0" / "2.4.1"; fails for anything else
+parse_line() {
+  [[ $1 =~ ^v?([0-9]+)\.([0-9]+)(\.([0-9]+))?$ ]] || return 1
+  echo "${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[4]:-0}"
+}
+
+# release/2.4 -> 2.4.0, hotfix/2.4.1 -> 2.4.1; a hotfix without a patch fails
+line_of_branch() {
+  local kind name
+  [[ $1 =~ ^(release|hotfix)/(.+)$ ]] || return 1
+  kind=${BASH_REMATCH[1]} name=${BASH_REMATCH[2]}
+  [[ $kind == hotfix && ! $name =~ ^v?[0-9]+\.[0-9]+\.[0-9]+$ ]] && return 1
+  parse_line "$name"
+}
+
+# The release or hotfix branch whose merge base with HEAD is the newest, i.e.
+# the line this commit was branched from most recently. On a tie (a hotfix
+# forked from the same commit as the release) the lower line wins.
+line_of_nearest_branch() {
+  local ref line base
+  while read -r ref; do
+    line=$(line_of_branch "${ref#origin/}") || continue
+    base=$(git merge-base "$ref" HEAD 2>/dev/null) || continue
+    echo "$(git show -s --format=%ct "$base") ${line//./ } $line"
+  done < <(git for-each-ref --format='%(refname:short)' refs/remotes/origin/release/ refs/remotes/origin/hotfix/) |
+    sort -k1,1nr -k2,2n -k3,3n -k4,4n | head -n 1 | { read -r _ _ _ _ line && echo "$line"; }
+}
+
+# major.minor.0 from the version in package.json, if there is one
+line_of_package() {
+  local version
+  [[ -f package.json ]] || return 1
+  version=$(sed -nE 's/^[[:space:]]*"version"[[:space:]]*:[[:space:]]*"([^"]+)".*/\1/p' package.json | head -n 1)
+  version=$(parse_line "${version%%[-+]*}") || return 1
+  echo "${version%.*}.0"
+}
+
+# The line for this branch: setting, branch name, nearest release/hotfix
+# branch, else major.minor of package.json.
+resolve_line() {
+  if [[ -n $RELEASE_LINE ]]; then
+    parse_line "$RELEASE_LINE" || die "invalid settings.release_line '$RELEASE_LINE', expected <major>.<minor>[.<patch>]"
+    return
+  fi
+  line_of_branch "$BRANCH" && return
+  line_of_nearest_branch && return
+  line_of_package && return
+  die "no release line for '$BRANCH': use settings.release_line or a semantic version in package.json"
+}
+
+# The next stable version of a line: highest existing vX.Y.Z plus one patch.
+next_stable() {
+  local line=$1 highest
+  highest=$(git tag --list "v${line%.*}.*" | sed -nE 's/^v[0-9]+\.[0-9]+\.([0-9]+)$/\1/p' | sort -n | tail -n 1)
+  echo "${line%.*}.$(( ${highest:--1} + 1 ))"
+}
+
+# A line whose stable tag exists was released; the next patch is the open one.
+next_free_patch() {
+  local line=$1 patch
+  while tag_exists "$line"; do
+    patch=${line##*.}
+    line=${line%.*}.$((patch + 1))
+  done
+  echo "$line"
+}
+
+next_beta() {
+  local line=$1 highest
+  highest=$(git tag --list "v$line-beta.*" | sed -nE 's/^.*-beta\.([0-9]+)$/\1/p' | sort -n | tail -n 1)
+  echo "$line-beta.$(( ${highest:--1} + 1 ))"
+}
+
+next_dev() {
+  local line=$1 stamp
+  while :; do
+    stamp=$(date -u +%Y%m%d%H%M%S)
+    tag_exists "$line-dev.$stamp" || { echo "$line-dev.$stamp"; return; }
+    sleep 1
+  done
+}
+
+case $BRANCH in
+  release/* | hotfix/*)
+    line=$(line_of_branch "$BRANCH") || die "unusable branch name '$BRANCH', expected release/X.Y[.Z] or hotfix/X.Y.Z"
+    VERSION=$(next_beta "$(next_free_patch "$line")")
+    ;;
+  *)
+    if [[ -n $RELEASE_BRANCH && $BRANCH == "$RELEASE_BRANCH" ]]; then
+      VERSION=$(next_stable "$(resolve_line)")
+    else
+      VERSION=$(next_dev "$(next_free_patch "$(resolve_line)")")
+    fi
+    ;;
+esac
+TAG=v$VERSION
+
+# A re-run must not produce a second tag and a second build for the same commit.
+# Only tags of the same kind count: a dev tag on a commit that is then merged
+# fast-forward into a release branch must not block its beta tag.
+case $TAG in
+  *-dev.*) same_kind='^v[0-9]+\.[0-9]+\.[0-9]+-dev\.' ;;
+  *-beta.*) same_kind='^v[0-9]+\.[0-9]+\.[0-9]+-beta\.' ;;
+  *) same_kind='^v[0-9]+\.[0-9]+\.[0-9]+$' ;;
+esac
+existing=$(git tag --points-at HEAD 'v*' | grep -E "$same_kind" | head -n 1 || true)
+if [[ -n $existing ]]; then
+  echo "bump: ${SHA:0:8} already carries $existing, nothing to do"
+  exit 0
+fi
+
+git tag "$TAG"
+if ! git push --quiet origin "refs/tags/$TAG"; then
+  echo "bump: push of $TAG rejected, the newer pipeline bumps"
+  exit 0
+fi
+echo "bump: $TAG on $BRANCH (${SHA:0:8})"

woodpecker/deploy/Dockerfile

@@ -0,0 +1,5 @@
+# Woodpecker plugin: writes dev and beta image tags with digest to oumta-deploy
+FROM alpine:3.20
+RUN apk add --no-cache bash git ca-certificates crane
+COPY deploy.sh /usr/local/bin/deploy.sh
+ENTRYPOINT ["/usr/local/bin/deploy.sh"]

woodpecker/deploy/deploy.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Woodpecker plugin "deploy": writes the pushed image with its digest to
+# oumta-deploy. ci/deploy-image.sh there decides the environment from the tag
+# (-dev. -> dev, -beta. -> beta, anything else -> nothing).
+set -euo pipefail
+
+die() { echo "deploy: $*" >&2; exit 1; }
+
+VAR=${PLUGIN_VAR:?settings.var is missing}
+REGISTRY=${PLUGIN_REGISTRY:-git.uesome.de}
+IMAGE=${PLUGIN_IMAGE:-$REGISTRY/${CI_REPO:?CI_REPO is missing}}
+TAG=${PLUGIN_TAG:-${CI_COMMIT_TAG:-}}
+DEPLOY_USER=${PLUGIN_DEPLOY_USER:-oumta-ci}
+DEPLOY_REPO=${PLUGIN_DEPLOY_REPO:-https://git.uesome.de/tanztee/oumta-deploy.git}
+[[ -n $TAG ]] || die "no tag (settings.tag or tag event)"
+[[ -n ${PLUGIN_DEPLOY_TOKEN:-} ]] || die "settings.deploy_token is missing"
+
+major=${TAG#v}; major=${major%%.*}
+VAR=${VAR//\{major\}/$major}
+
+if [[ -n ${PLUGIN_REGISTRY_USERNAME:-} ]]; then
+  crane auth login "$REGISTRY" -u "$PLUGIN_REGISTRY_USERNAME" --password-stdin \
+    <<<"${PLUGIN_REGISTRY_PASSWORD:?settings.registry_password is missing}" >/dev/null
+fi
+
+# Token only via credential helper, never in a URL or config, so no log shows it
+helper='!f() { echo "username=$DEPLOY_USER"; echo "password=$PLUGIN_DEPLOY_TOKEN"; }; f'
+export DEPLOY_USER PLUGIN_DEPLOY_TOKEN
+work=$(mktemp -d)
+git -c credential.helper="$helper" clone --quiet "$DEPLOY_REPO" "$work/oumta-deploy"
+git -C "$work/oumta-deploy" config credential.helper "$helper"
+
+export DEPLOY_ENVS=${PLUGIN_ENVS:-}
+export SOURCE_REPO=${CI_REPO:-} SOURCE_COMMIT=${CI_COMMIT_SHA:-}
+"$work/oumta-deploy/ci/deploy-image.sh" "$VAR" "${IMAGE,,}:$TAG"