Skip to content

Release PR for 2025-12-06 13:45 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
disafronov merged 1 commit into from
Dec 6, 2025
Merged

Release PR for 2025-12-06 13:45 #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions .github/workflows/release-stable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,24 @@ jobs:

# Fetch latest state after semantic-release pushed commits
# This ensures we get all commits that semantic-release created
git fetch origin release:release
git fetch origin main:main
git fetch origin

# Check if main is already up to date
if git diff --quiet main release; then
# Check if main is already up to date with release
if git diff --quiet origin/main origin/release; then
echo "main is already up to date with release"
exit 0
fi

# Check if main is ancestor of release (can fast-forward)
if git merge-base --is-ancestor main release; then
if git merge-base --is-ancestor origin/main origin/release; then
echo "Fast-forwarding main to release"
git checkout main
git merge --ff-only release
git checkout -B main origin/main
git merge --ff-only origin/release
git push origin main
else
echo "Rebasing main onto release (force-with-lease required)"
git checkout main
git rebase release
git checkout -B main origin/main
git rebase origin/release
# Use --force-with-lease for safety: only push if remote hasn't changed
git push --force-with-lease origin main
fi
Expand Down