test
All checks were successful
Build and Push Teamspeak Images on Base Image Update / check-for-changes (push) Successful in 12s
Build and Push Teamspeak Images on Base Image Update / build-alpine (push) Has been skipped
Build and Push Teamspeak Images on Base Image Update / build-debian (push) Has been skipped
Build and Push Teamspeak Images on Base Image Update / build-basic (push) Has been skipped
Build and Push Teamspeak Images on Base Image Update / generate-build-info (push) Has been skipped
Build and Push Teamspeak Images on Base Image Update / generate-changelogs (push) Has been skipped

This commit is contained in:
2025-07-20 12:25:46 -07:00
parent 167fcf8d31
commit 108e453eae

View File

@@ -75,9 +75,13 @@ jobs:
done done
if [ "$changes" = true ]; then if [ "$changes" = true ]; then
# Stash local changes before rebasing
git stash push -m "temp-stash-before-rebase"
git fetch origin main git fetch origin main
git rebase origin/main git rebase origin/main
git stash pop || true
# Now re-check and commit the changes
git add .cache/*-base.digest git add .cache/*-base.digest
git commit -m "Update base image digests ($(date -u +'%Y-%m-%dT%H:%M:%SZ'))" git commit -m "Update base image digests ($(date -u +'%Y-%m-%dT%H:%M:%SZ'))"
git push origin HEAD:main git push origin HEAD:main