test
Some checks failed
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Docker prune (vm-docker-build2) (push) Successful in 48s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build RootFS Archives (bullseye) (push) Successful in 9m23s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build RootFS Archives (trixie) (push) Successful in 10m38s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build RootFS Archives (bookworm) (push) Successful in 12m24s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build & Push Docker Images (bullseye) (push) Failing after 1m19s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build & Push Docker Images (bookworm) (push) Failing after 1m20s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / generate-changelogs (push) Successful in 2m28s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / Build & Push Docker Images (trixie) (push) Failing after 2m34s
Build, Upload RootFS, and Push Docker Images, update changelog, update build info. / generate-build-info (push) Has been skipped

This commit is contained in:
2025-12-20 15:49:07 -08:00
parent cc4ce1f479
commit b31cb55539

View File

@@ -214,29 +214,43 @@ 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 --global user.email "${{ env.GIT_EMAIL }}"
git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then
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]"
# Create temporary branch for this version
TEMP_BRANCH="tmp-update-${{ matrix.version }}-$(date -u +%s)"
git checkout -b "$TEMP_BRANCH"
# Fetch latest changes and rebase local commits on top
git pull --rebase origin main || true
# Stage changes
git add **/*.tar.bz2 sha256sums.txt
# Push after rebase
git push origin main
echo "archives_changed=true" >> $GITEA_OUTPUT
else
echo "[INFO] No changes to commit."
if git diff --cached --quiet; then
echo "[INFO] No changes to commit for ${{ matrix.version }}"
echo "archives_changed=false" >> $GITEA_OUTPUT
exit 0
fi
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
# build-and-push-docker-images:
# needs:
# - docker-prune