From 55d65f48410c71cee7aa976cc48bc03b8ad6c9a2 Mon Sep 17 00:00:00 2001 From: Penry Date: Sun, 7 Jun 2026 18:19:53 +0200 Subject: [PATCH] .gitea/workflows/linux_arm64_docker.yaml aktualisiert Fixes again...:( --- .gitea/workflows/linux_arm64_docker.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/linux_arm64_docker.yaml b/.gitea/workflows/linux_arm64_docker.yaml index f2c47ad..75b0cd3 100644 --- a/.gitea/workflows/linux_arm64_docker.yaml +++ b/.gitea/workflows/linux_arm64_docker.yaml @@ -37,11 +37,15 @@ jobs: if [[ -z "$LAST_TAG" ]]; then LAST_TAG="v0.0.1-alpha" - DISTANCE=$(git rev-list --count origin/main) + BASE_COMMIT="origin/main" else - DISTANCE=$(git rev-list "${LAST_TAG}..origin/main" --count) + BASE_COMMIT=$(git rev-list -n 1 "${LAST_TAG}") + BASE_COMMIT=$(git rev-parse "${LAST_TAG}") fi + MERGE_BASE=$(git merge-base "${LAST_TAG}" origin/main) + DISTANCE=$(git rev-list --count "${LAST_TAG}..origin/main") + BASE_VERSION="${LAST_TAG#v}" if [[ "$BASE_VERSION" == *-* ]]; then @@ -55,6 +59,7 @@ jobs: echo "VERSION=$VERSION" >> "$GITHUB_ENV" echo "Last tag: $LAST_TAG" + echo "Merge base: $MERGE_BASE" echo "Distance to origin/main: $DISTANCE" echo "Final version: $VERSION"