test

.gitea/workflows/base-build.yml

@@ -214,28 +214,42 @@ jobs:
           # Add new sha256
           sha256sum "$TAR" >> sha256sums.txt
 
-      - name: Commit and push if changed
+      - name: Commit and push if changed (matrix-safe)
         id: commit_archives
         run: |
           cd upload-repo
-          git config --global user.name "${{ env.GIT_USERNAME }}"
+          git config user.name "${{ env.GIT_USERNAME }}"
-          git config --global user.email "${{ env.GIT_EMAIL }}"
+          git config user.email "${{ env.GIT_EMAIL }}"
 
-          if git status --porcelain | grep .; then
+          # Create temporary branch for this version
+          TEMP_BRANCH="tmp-update-${{ matrix.version }}-$(date -u +%s)"
+          git checkout -b "$TEMP_BRANCH"
+
+          # Stage changes
           git add **/*.tar.bz2 sha256sums.txt
-            git commit -m "Update base images and checksum for ${{ matrix.version }} on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
 
-            # Fetch latest changes and rebase local commits on top
+          if git diff --cached --quiet; then
-            git pull --rebase origin main || true
+            echo "[INFO] No changes to commit for ${{ matrix.version }}"
+            echo "archives_changed=false" >> $GITEA_OUTPUT
+            exit 0
+          fi
 
-            # Push after rebase
+          git commit -m "Update base image and checksum for ${{ matrix.version }} on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
+
+          # Push temporary branch
+          git push origin "$TEMP_BRANCH"
+
+          # Merge temp branch into main safely
+          git checkout main
+          git fetch origin main
+          git merge --no-ff --no-edit "$TEMP_BRANCH"
+
+          # Push main
           git push origin main
 
+          # Delete temporary branch on remote
+          git push origin --delete "$TEMP_BRANCH" || true
           echo "archives_changed=true" >> $GITEA_OUTPUT
-          else
-            echo "[INFO] No changes to commit."
-            echo "archives_changed=false" >> $GITEA_OUTPUT
-          fi
 
   # build-and-push-docker-images:
   #   needs: