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

fix branch
vintage-story-build-server / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
vintage-story-build-server / poll-debian-base-and-detect-changes (push) Successful in 14s
Details
vintage-story-build-server / Build and Push vintage-story (push) Failing after 6s
Details
vintage-story-build-server / generate-changelogs (push) Skipped
Details
vintage-story-build-server / generate-build-info (push) Skipped
Details

Browse Source
This commit is contained in:
fithwum
2026-07-27 12:36:25 -07:00
parent a10fdea18b
commit e21bb2bfab
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/vintage-story-build-server.yml
+21 -21
View File
@@ -88,18 +88,18 @@ jobs:
git commit -m "Update base digest to $CURRENT_DIGEST" || true
# --- Safe rebase with auto conflict resolution ---
git fetch origin master
if ! git rebase --strategy-option=theirs origin/master; then
git fetch origin main
if ! git rebase --strategy-option=theirs origin/main; then
echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
git rebase --abort
git fetch origin master
git reset --hard origin/master
git fetch origin main
git reset --hard origin/main
echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
git add ${{ env.DIGEST_FILE }}
git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
fi
git push origin HEAD:master
git push origin HEAD:main
echo "changed=true" >> $GITHUB_OUTPUT
- name: Detect changed vintage-story versions
@@ -246,27 +246,27 @@ jobs:
# Push temporary branch
git push origin HEAD:$TEMP_BRANCH
# Rebase temp branch onto latest master
git fetch origin master
# Rebase temp branch onto latest main
git fetch origin main
git checkout "$TEMP_BRANCH"
if ! git rebase origin/master; then
if ! git rebase origin/main; then
echo "[WARN] Rebase failed, using merge instead."
git rebase --abort || true
git merge origin/master --no-edit
git merge origin/main --no-edit
fi
git push origin HEAD:$TEMP_BRANCH --force
# Fast-forward master
git checkout master
git reset --hard origin/master
# Fast-forward main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge changelog updates"
git push origin master
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
@@ -370,27 +370,27 @@ jobs:
# Push temporary branch
git push origin HEAD:$TEMP_BRANCH
# Rebase temp branch onto latest master
git fetch origin master
# Rebase temp branch onto latest main
git fetch origin main
git checkout "$TEMP_BRANCH"
if ! git rebase origin/master; then
if ! git rebase origin/main; then
echo "[WARN] Rebase failed, using merge instead."
git rebase --abort || true
git merge origin/master --no-edit
git merge origin/main --no-edit
fi
git push origin HEAD:$TEMP_BRANCH --force
# Merge into master
git checkout master
git reset --hard origin/master
# Merge into main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge build-info updates"
git push origin master
git push origin main
git push origin --delete "$TEMP_BRANCH" || true