Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/wangamail-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,15 @@ jobs:
git commit -m "chore(wangamail-csharp): bump version to ${{ steps.bump.outputs.new_version }} [skip ci]"
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main || git push origin main --force-with-lease
# Retry push to avoid stale-ref/lock failures when remote updates
for _ in 1 2 3; do
if git push origin main; then
break
fi
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main --force-with-lease || true
done
fi

- name: Job summary
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/wangamail-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,15 @@ jobs:
# Sync with remote main to avoid non-fast-forward push failures
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main || git push origin main --force-with-lease
# Retry push to avoid stale-ref/lock failures when remote updates
for _ in 1 2 3; do
if git push origin main; then
break
fi
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main --force-with-lease || true
done
fi

- name: Job summary
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/wangapayfast-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,15 @@ jobs:
git commit -m "chore(wangapayfast-csharp): bump version to ${{ steps.bump.outputs.new_version }} [skip ci]"
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main || git push origin main --force-with-lease
# Retry push to avoid stale-ref/lock failures when remote updates
for _ in 1 2 3; do
if git push origin main; then
break
fi
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main --force-with-lease || true
done
fi

- name: Job summary
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/wangapayfast-rs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,15 @@ jobs:
# Sync with remote main to avoid non-fast-forward push failures
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main || git push origin main --force-with-lease
# Retry push to avoid stale-ref/lock failures when remote updates
for _ in 1 2 3; do
if git push origin main; then
break
fi
git fetch origin main || true
git pull origin main --rebase || git pull origin main --no-rebase || true
git push origin main --force-with-lease || true
done
fi

- name: Job summary
Expand Down
Loading