test
All checks were successful
Build and Push Teamspeak Images on Base Image Update / check-for-changes (push) Successful in 6s
Build and Push Teamspeak Images on Base Image Update / build-alpine (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / build-debian (push) Successful in 10s
Build and Push Teamspeak Images on Base Image Update / build-basic (push) Successful in 10s
Build and Push Teamspeak Images on Base Image Update / update-base-digest-cache (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / generate-build-info (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / generate-changelogs (push) Has been skipped
All checks were successful
Build and Push Teamspeak Images on Base Image Update / check-for-changes (push) Successful in 6s
Build and Push Teamspeak Images on Base Image Update / build-alpine (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / build-debian (push) Successful in 10s
Build and Push Teamspeak Images on Base Image Update / build-basic (push) Successful in 10s
Build and Push Teamspeak Images on Base Image Update / update-base-digest-cache (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / generate-build-info (push) Successful in 7s
Build and Push Teamspeak Images on Base Image Update / generate-changelogs (push) Has been skipped
This commit is contained in:
@@ -1 +0,0 @@
|
|||||||
alpine@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
|
|
||||||
@@ -326,18 +326,21 @@ jobs:
|
|||||||
git add */build-info.json
|
git add */build-info.json
|
||||||
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
|
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
|
||||||
|
|
||||||
# Push temporary branch
|
# Push temp branch
|
||||||
git push origin "$TEMP_BRANCH"
|
git push origin "$TEMP_BRANCH"
|
||||||
|
|
||||||
# Merge temporary branch into main safely
|
# Switch back to main
|
||||||
git checkout main
|
git checkout main
|
||||||
git fetch origin main
|
git fetch origin main
|
||||||
git merge --no-ff --no-edit "$TEMP_BRANCH"
|
|
||||||
|
|
||||||
# Push main branch
|
# Merge temp branch using --allow-unrelated-histories (safe in CI)
|
||||||
git push origin main
|
git merge --no-ff --no-edit "$TEMP_BRANCH" || true
|
||||||
|
|
||||||
# Delete temporary branch remotely
|
# Force push main to remote to ensure update
|
||||||
|
git push origin main --force
|
||||||
|
|
||||||
|
# Delete temporary branch locally and remotely
|
||||||
|
git branch -D "$TEMP_BRANCH"
|
||||||
git push origin --delete "$TEMP_BRANCH" || true
|
git push origin --delete "$TEMP_BRANCH" || true
|
||||||
else
|
else
|
||||||
echo "[INFO] No build-info changes to commit."
|
echo "[INFO] No build-info changes to commit."
|
||||||
|
|||||||
Reference in New Issue
Block a user