fithwum/teamspeak-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test
All checks were successful
Build and Push Teamspeak Images on Base Image Update / check-for-changes (push) Successful in 6s
Details
Build and Push Teamspeak Images on Base Image Update / build-alpine (push) Successful in 7s
Details
Build and Push Teamspeak Images on Base Image Update / build-debian (push) Successful in 10s
Details
Build and Push Teamspeak Images on Base Image Update / build-basic (push) Successful in 10s
Details
Build and Push Teamspeak Images on Base Image Update / update-base-digest-cache (push) Successful in 7s
Details
Build and Push Teamspeak Images on Base Image Update / generate-build-info (push) Successful in 7s
Details
Build and Push Teamspeak Images on Base Image Update / generate-changelogs (push) Has been skipped
Details

Browse Source
This commit is contained in:
fithwum
2026-01-11 06:52:38 -08:00
parent 1f919d1297
commit bf44840484
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.gitea/workflows/pipeline.yml
View File

@@ -326,18 +326,21 @@ jobs:
git add */build-info.json
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"
# Merge temporary branch into main safely
# Switch back to main
git checkout main
git fetch origin main
git merge --no-ff --no-edit "$TEMP_BRANCH"
# Push main branch
git push origin main
# Merge temp branch using --allow-unrelated-histories (safe in CI)
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
else
echo "[INFO] No build-info changes to commit."