fix: use checked-out commit in Gitea CD
CI / metadata (push) Successful in 53s
CI / formatting (push) Successful in 53s
CI / lint (push) Successful in 1m6s
CI / tests (push) Successful in 1m59s

This commit is contained in:
fraujulian committed 2026-10-02 15:19:05 +02:00
1 parent 0ae27adf90
commit d07db3d3cd
2 files changed
+7 -6

No files matched your search

+5 -4
View File
@@ -43,7 +43,7 @@ runs:
fi fi
echo "value=$version" >> "$GITHUB_OUTPUT" echo "value=$version" >> "$GITHUB_OUTPUT"
echo "release_tag=$release_tag" >> "$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 - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
@@ -73,6 +73,7 @@ runs:
RELEASE_TAG: ${{ steps.version.outputs.release_tag }} RELEASE_TAG: ${{ steps.version.outputs.release_tag }}
PRERELEASE: ${{ inputs.prerelease }} PRERELEASE: ${{ inputs.prerelease }}
run: | run: |
commit_sha="$(git rev-parse HEAD)"
api_url="${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases" api_url="${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases"
# ponytail: 50 recent releases cover normal reruns; paginate if old releases are rebuilt. # ponytail: 50 recent releases cover normal reruns; paginate if old releases are rebuilt.
releases="$(curl --fail-with-body --silent --show-error \ 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')" '[.[] | select(.draft == false and .prerelease == $prerelease and .tag_name != $tag)][0].tag_name // empty')"
if [ -n "$previous_tag" ]; then 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}" full_changelog="${{ gitea.server_url }}/${{ gitea.repository }}/compare/${previous_tag}...${RELEASE_TAG}"
else else
commit_messages="$(git log --reverse --format='- %s' "${GITEA_SHA}")" commit_messages="$(git log --reverse --format='- %s' "$commit_sha")"
full_changelog="" full_changelog=""
fi fi
@@ -107,7 +108,7 @@ runs:
jq --null-input \ jq --null-input \
--arg tag "$RELEASE_TAG" \ --arg tag "$RELEASE_TAG" \
--arg target "$GITEA_SHA" \ --arg target "$commit_sha" \
--argjson prerelease "$PRERELEASE" \ --argjson prerelease "$PRERELEASE" \
--rawfile body release-notes.md \ --rawfile body release-notes.md \
'{tag_name: $tag, target_commitish: $target, name: $tag, body: $body, prerelease: $prerelease}' \ '{tag_name: $tag, target_commitish: $target, name: $tag, body: $body, prerelease: $prerelease}' \
+2 -2
View File
@@ -28,13 +28,13 @@ jobs:
--header "Authorization: token ${GITEA_TOKEN}" \ --header "Authorization: token ${GITEA_TOKEN}" \
"${API_URL}?branch=main&limit=50")" "${API_URL}?branch=main&limit=50")"
previous_sha="$(printf '%s' "$runs" | jq -r \ 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')" '[.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 if [ -z "$previous_sha" ]; then
echo 'changed=true' >> "$GITHUB_OUTPUT" echo 'changed=true' >> "$GITHUB_OUTPUT"
else else
git cat-file -e "${previous_sha}^{commit}" 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 'changed=false' >> "$GITHUB_OUTPUT"
echo 'No changes since the previous successful development release.' echo 'No changes since the previous successful development release.'
else else