Skip to content

nightly: don't rebase package branches that have an open PR #3790

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
luhenry merged 3 commits into from
Oct 23, 2026
Merged

nightly: don't rebase package branches that have an open PR #3790

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9c9ce7
nightly: don't rebase package branches that have an open PR
claude Oct 23, 2026
de192e8
nightly: never rebase an existing package branch
claude Oct 23, 2026
056224b
nightly: restore local declarations in open_pr
claude Oct 23, 2026
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
23 changes: 8 additions & 15 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@ jobs:
# Re-declare each package on the same package-specific branch used by
# wheel publication. This preserves publication metadata already
# waiting for review while keeping unrelated packages isolated.
#
# An existing branch is built on as it is, never rebased: a force push
# re-triggers every workflow on its PR, even when they were passing
# and nothing conflicted. Conflicts with main are left to be fixed
# manually.
open_pr() {
local package="$1" slug="$2" title="$3"
local branch="package/$slug" pr pr_title="$slug: update packages" remote_sha=""
local branch="package/$slug" pr pr_title="$slug: update packages"

if git fetch --quiet origin "$branch" 2>/dev/null; then
remote_sha=$(git rev-parse FETCH_HEAD) || return 1
git switch --force-create "$branch" "$remote_sha" || return 1
if ! git rebase "$base"; then
git rebase --abort || true
return 1
fi
git switch --force-create "$branch" FETCH_HEAD || return 1
else
git switch --force-create "$branch" "$base" || return 1
fi
Expand All @@ -97,21 +97,14 @@ jobs:
ci_scripts/check_versions.py --declare "$package" || return 1

if git diff --quiet -- docs/packages ci_scripts/packages.txt ci_scripts/deprecated.txt; then
if [ -n "$remote_sha" ] && [ "$(git rev-parse HEAD)" != "$remote_sha" ]; then
git push --force-with-lease="$branch:$remote_sha" origin "$branch" || return 1
fi
echo "$package: nothing to declare"
return 0
fi

git add docs/packages ci_scripts/packages.txt ci_scripts/deprecated.txt || return 1
git commit -s -m "$title" || return 1

if [ -n "$remote_sha" ]; then
git push --force-with-lease="$branch:$remote_sha" origin "$branch" || return 1
else
git push origin "$branch" || return 1
fi
git push origin "$branch" || return 1

pr=$(gh pr list --repo "$GITHUB_REPOSITORY" --head "$branch" --state open --json url --jq '.[0].url') || return 1
if [ -n "$pr" ]; then
Expand Down
Loading