From 45479d9df7e34a3e384d2bb5811fe9b5c3f9836b Mon Sep 17 00:00:00 2001 From: Penry Date: Sun, 7 Jun 2026 18:14:47 +0200 Subject: [PATCH] .gitea/workflows/linux_arm64_docker.yaml aktualisiert Adapted Versioning and Workflow --- .gitea/workflows/linux_arm64_docker.yaml | 58 ++++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/linux_arm64_docker.yaml b/.gitea/workflows/linux_arm64_docker.yaml index c34512c..f2c47ad 100644 --- a/.gitea/workflows/linux_arm64_docker.yaml +++ b/.gitea/workflows/linux_arm64_docker.yaml @@ -28,35 +28,35 @@ jobs: - name: Build version shell: bash run: | - set -euo pipefail - - git fetch --force --tags origin - git fetch --force origin main - - LAST_TAG=$(git tag -l 'v*' --sort=-version:refname | head -n 1) - - if [[ -z "$LAST_TAG" ]]; then - LAST_TAG="v0.0.1-alpha" - DISTANCE=$(git rev-list --count origin/main) - else - DISTANCE=$(git rev-list "${LAST_TAG}..origin/main" --count) - fi - - BASE_VERSION="${LAST_TAG#v}" - - if [[ "$BASE_VERSION" == *-* ]]; then - VERSION="${BASE_VERSION}.${DISTANCE}" - else - VERSION="${BASE_VERSION}-nightly.${DISTANCE}" - fi - - echo "LAST_TAG=$LAST_TAG" >> "$GITHUB_ENV" - echo "DISTANCE=$DISTANCE" >> "$GITHUB_ENV" - echo "VERSION=$VERSION" >> "$GITHUB_ENV" - - echo "Last tag: $LAST_TAG" - echo "Distance to origin/main: $DISTANCE" - echo "Final version: $VERSION" + set -euo pipefail + + git fetch --force --tags origin + git fetch --force origin main + + LAST_TAG=$(git tag --merged origin/main -l 'v*' --sort=-creatordate | head -n 1) + + if [[ -z "$LAST_TAG" ]]; then + LAST_TAG="v0.0.1-alpha" + DISTANCE=$(git rev-list --count origin/main) + else + DISTANCE=$(git rev-list "${LAST_TAG}..origin/main" --count) + fi + + BASE_VERSION="${LAST_TAG#v}" + + if [[ "$BASE_VERSION" == *-* ]]; then + VERSION="${BASE_VERSION}.${DISTANCE}" + else + VERSION="${BASE_VERSION}-nightly.${DISTANCE}" + fi + + echo "LAST_TAG=$LAST_TAG" >> "$GITHUB_ENV" + echo "DISTANCE=$DISTANCE" >> "$GITHUB_ENV" + echo "VERSION=$VERSION" >> "$GITHUB_ENV" + + echo "Last tag: $LAST_TAG" + echo "Distance to origin/main: $DISTANCE" + echo "Final version: $VERSION" - name: Set .NET version variables shell: bash