From b32a97ed9ba79a6a3aa0c7551931b5429b9c975c Mon Sep 17 00:00:00 2001
From: moilanik <niko.moilanen@tietoevry.com>
Date: Sun, 14 Jun 2026 10:55:18 +0300
Subject: [PATCH] qwen

---
 .gitea/workflows/build_publish-artifact.yml | 57 ++++++++++++++++-----
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/build_publish-artifact.yml b/.gitea/workflows/build_publish-artifact.yml
index 7a88bf2..c1e0bd4 100644
--- a/.gitea/workflows/build_publish-artifact.yml
+++ b/.gitea/workflows/build_publish-artifact.yml
@@ -73,27 +73,37 @@ jobs:
 
       - name: Build container
         shell: bash
+        id: build
         run: |
           VERSION="${{ needs.check.outputs.version }}"
           NOW=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-          set +e
           docker build \
             --label "git.commit=${GITHUB_SHA:0:8}" \
             --label "git.commitBy=${GITHUB_ACTOR}" \
             --label "build.date=${NOW}" \
             -t "minimal:${VERSION}" .
-          BUILD_EXIT=$?
-          mkdir -p /tmp/image
+          echo "exit-code=$?" >> "$GITHUB_OUTPUT"
+
+      - name: Report docker build status
+        if: always()
+        run: |
+          BUILD_EXIT="${{ steps.build.outputs.exit-code }}"
           if [ "${BUILD_EXIT}" = "0" ]; then
-            docker save "minimal:${VERSION}" -o /tmp/image/artifact.tar
             bash scripts/report-status.sh success "Docker build OK" ci-docker-build
           else
             bash scripts/report-status.sh failure "Docker build FAILED" ci-docker-build
           fi
-          echo "BUILD_EXIT=${BUILD_EXIT}" >> "${GITHUB_ENV}"
           exit ${BUILD_EXIT}
 
-      - name: Save Docker image for next job
+      - name: Save Docker image
+        if: success()
+        run: |
+          VERSION="${{ needs.check.outputs.version }}"
+          mkdir -p /tmp/image
+          docker save "minimal:${VERSION}" -o /tmp/image/artifact.tar
+
+      - name: Upload Docker image artifact
+        if: success()
         uses: actions/upload-artifact@v4
         with:
           name: docker-image
@@ -120,17 +130,22 @@ jobs:
 
       - name: Push to Gitea Packages
         shell: bash
+        id: push
         run: |
           VERSION="${{ needs.check.outputs.version }}"
-          set +e
           docker load -i /tmp/image/artifact.tar
           REGISTRY=$(echo "$GITEA_API_URL" | sed 's|https://||')
           IMAGE="$REGISTRY/niko/gitea-ci-library/minimal:$VERSION"
           docker tag "minimal:$VERSION" "$IMAGE"
           docker login "$REGISTRY" -u niko -p "$GITEA_TOKEN"
           docker push "$IMAGE"
-          PUSH_EXIT=$?
           docker logout "$REGISTRY" > /dev/null 2>&1
+          echo "exit-code=$?" >> "$GITHUB_OUTPUT"
+
+      - name: Report docker push status
+        if: always()
+        run: |
+          PUSH_EXIT="${{ steps.push.outputs.exit-code }}"
           if [ "${PUSH_EXIT}" = "0" ]; then
             bash scripts/report-status.sh success "Docker push OK" ci-docker-push
           else
@@ -146,9 +161,9 @@ jobs:
 
       - name: Create git tag
         shell: bash
+        id: tag
         run: |
           VERSION="${{ needs.check.outputs.version }}"
-          set +e
           HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" -X POST \
             "$GITEA_API_URL/api/v1/repos/$GITHUB_REPOSITORY/tags" \
             -H "Authorization: token $GITEA_TOKEN" \
@@ -161,11 +176,27 @@ jobs:
 
           if [ "$HTTP_CODE" = "201" ]; then
             echo "Tag $VERSION created"
-            bash scripts/report-status.sh success "Tag $VERSION" ci-docker-tag
+            echo "status=success" >> "$GITHUB_OUTPUT"
+            echo "message=Tag $VERSION created" >> "$GITHUB_OUTPUT"
           elif [ "$HTTP_CODE" = "409" ]; then
             echo "Tag $VERSION already exists (parallel build won), skipping"
-            bash scripts/report-status.sh success "Tag exists" ci-docker-tag
+            echo "status=success" >> "$GITHUB_OUTPUT"
+            echo "message=Tag exists" >> "$GITHUB_OUTPUT"
           else
-            bash scripts/report-status.sh failure "Tag FAILED HTTP $HTTP_CODE" ci-docker-tag
-            exit 1
+            echo "status=failure" >> "$GITHUB_OUTPUT"
+            echo "message=Tag FAILED HTTP $HTTP_CODE" >> "$GITHUB_OUTPUT"
+            echo "exit-code=$HTTP_CODE" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Report docker tag status
+        if: always()
+        run: |
+          TAG_STATUS="${{ steps.tag.outputs.status }}"
+          TAG_MESSAGE="${{ steps.tag.outputs.message }}"
+          if [ "${TAG_STATUS}" = "success" ]; then
+            bash scripts/report-status.sh success "${TAG_MESSAGE}" ci-docker-tag
+          else
+            TAG_EXIT="${{ steps.tag.outputs.exit-code }}"
+            bash scripts/report-status.sh failure "${TAG_MESSAGE}" ci-docker-tag
+            exit ${TAG_EXIT}
           fi