From d07db3d3cda7dc90ef5c2cd58758203a4ef25daf Mon Sep 17 00:00:00 2001
From: Julian Lechner <fraujulian@lechner.top>
Date: Fri, 2 Oct 2026 15:19:05 +0200
Subject: [PATCH] fix: use checked-out commit in Gitea CD

---
 .gitea/actions/publish/action.yml   | 9 +++++----
 .gitea/workflows/CD Development.yml | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitea/actions/publish/action.yml b/.gitea/actions/publish/action.yml
index 13ed45e..640593b 100644
--- a/.gitea/actions/publish/action.yml
+++ b/.gitea/actions/publish/action.yml
@@ -43,7 +43,7 @@ runs:
         fi
         echo "value=$version" >> "$GITHUB_OUTPUT"
         echo "release_tag=$release_tag" >> "$GITHUB_OUTPUT"
-        echo "revision=$GITEA_RUN_ATTEMPT" >> "$GITHUB_OUTPUT"
+        echo "revision=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
@@ -73,6 +73,7 @@ runs:
         RELEASE_TAG: ${{ steps.version.outputs.release_tag }}
         PRERELEASE: ${{ inputs.prerelease }}
       run: |
+        commit_sha="$(git rev-parse HEAD)"
         api_url="${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases"
         # ponytail: 50 recent releases cover normal reruns; paginate if old releases are rebuilt.
         releases="$(curl --fail-with-body --silent --show-error \
@@ -84,10 +85,10 @@ runs:
             '[.[] | select(.draft == false and .prerelease == $prerelease and .tag_name != $tag)][0].tag_name // empty')"
 
         if [ -n "$previous_tag" ]; then
-            commit_messages="$(git log --reverse --format='- %s' "${previous_tag}..${GITEA_SHA}")"
+            commit_messages="$(git log --reverse --format='- %s' "${previous_tag}..${commit_sha}")"
             full_changelog="${{ gitea.server_url }}/${{ gitea.repository }}/compare/${previous_tag}...${RELEASE_TAG}"
         else
-            commit_messages="$(git log --reverse --format='- %s' "${GITEA_SHA}")"
+            commit_messages="$(git log --reverse --format='- %s' "$commit_sha")"
             full_changelog=""
         fi
 
@@ -107,7 +108,7 @@ runs:
 
         jq --null-input \
             --arg tag "$RELEASE_TAG" \
-            --arg target "$GITEA_SHA" \
+            --arg target "$commit_sha" \
             --argjson prerelease "$PRERELEASE" \
             --rawfile body release-notes.md \
             '{tag_name: $tag, target_commitish: $target, name: $tag, body: $body, prerelease: $prerelease}' \
diff --git a/.gitea/workflows/CD Development.yml b/.gitea/workflows/CD Development.yml
index a746529..e4797da 100644
--- a/.gitea/workflows/CD Development.yml	
+++ b/.gitea/workflows/CD Development.yml	
@@ -28,13 +28,13 @@ jobs:
             --header "Authorization: token ${GITEA_TOKEN}" \
             "${API_URL}?branch=main&limit=50")"
           previous_sha="$(printf '%s' "$runs" | jq -r \
-            --argjson current_run "$GITEA_RUN_ID" \
+            --argjson current_run "$GITHUB_RUN_ID" \
             '[.workflow_runs[] | select(.id != $current_run and .status == "success" and (.event == "schedule" or .event == "workflow_dispatch"))][0].head_sha // empty')"
           if [ -z "$previous_sha" ]; then
             echo 'changed=true' >> "$GITHUB_OUTPUT"
           else
             git cat-file -e "${previous_sha}^{commit}"
-            if git diff --quiet "$previous_sha" "$GITEA_SHA"; then
+            if git diff --quiet "$previous_sha" HEAD; then
               echo 'changed=false' >> "$GITHUB_OUTPUT"
               echo 'No changes since the previous successful development release.'
             else