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
118 changes: 0 additions & 118 deletions .github/workflows/auto-rebase-prs.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/release-semantic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: "Release: Semantic Version"
# release, then reconcile dev. Dev-source reconciles FF-only; hotfix-
# staging source rebases dev onto the new main so the release tag
# enters dev's ancestry — the only force-push this workflow performs.
# `auto-rebase-prs.yaml` then rebases open PRs targeting dev.
# Open PRs targeting dev will need a manual rebase by their authors.

on:
workflow_dispatch:
Expand Down Expand Up @@ -249,6 +249,6 @@ jobs:
echo "- Source: hotfix-staging \`${{ steps.validate.outputs.source }}\`"
echo "- New main: \`$(git rev-parse --short=9 "${NEW_MAIN}")\`"
echo "- Dev rebased linearly onto new main; identical-patch commits auto-dropped by \`git rebase\`."
echo "- Open PRs against dev are auto-rebased by the \`Auto-rebase open PRs\` workflow."
echo "- Open PRs against dev will need a manual rebase by their authors."
} >> "$GITHUB_STEP_SUMMARY"
echo "::notice::Reconciled dev onto main via rebase (linear history preserved)."
Loading