ci: add workflow to auto-rebase feature branches #2290
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a GitHub Actions workflow that automatically rebases long-running feature branches onto main when changes are pushed to main. Features: - Triggers on push to main branch - Rebases configured feature branches (develop-v2, develop-v1.5.0, develop-v1.6.0) - Creates timestamped backup branches before force pushing - Uses --force-with-lease for safer force pushes - Sends Slack notifications on success or failure - Only force pushes if rebase actually changed history Security: - Uses GitHub App token for authentication (bypasses branch protection) - Explicit permissions block (contents: write) - Uses jq for safe JSON construction in Slack payloads - Environment variables passed via env: block to prevent injection 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds a GitHub Actions workflow to automatically rebase long-running feature branches (develop-v2, develop-v1.5.0, develop-v1.6.0) onto main whenever commits are pushed to the main branch. The workflow creates timestamped backups before force-pushing, uses --force-with-lease for safety, and sends Slack notifications on both success and failure scenarios.
Key Changes
- Automated rebase workflow triggered on push to
mainwith backup and force-push safety mechanisms - GitHub App token-based authentication for git operations
- Slack notification system for rebase success/failure with detailed branch status reporting
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
The $'\n' syntax produces actual newline characters that jq will properly JSON-encode, rather than literal backslash-n which would be double-escaped. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
Co-authored-by: Copilot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Adds a GitHub Actions workflow that automatically keeps long-running feature branches rebased onto
main. This reduces manual maintenance overhead and ensures feature branches stay current.How it works
main- When commits are merged/pushed to main, the workflow runsorigin/maindevelop-v2-backup-20241202-143052)Configured branches
develop-v2develop-v1.5.0develop-v1.6.0Safety features
--force-with-lease- Prevents overwriting unexpected changesSecurity
REBASE_APP_IDandREBASE_APP_PRIVATE_KEYsecrets)permissions: contents: writeblockjqfor safe JSON construction in Slack payloads (prevents injection)env:block rather than inline${{ }}interpolationPrerequisites
The following secrets must be configured:
REBASE_APP_ID- GitHub App IDREBASE_APP_PRIVATE_KEY- GitHub App private keySLACK_WEBHOOK_URL- Slack incoming webhook URLThe GitHub App needs write access to repository contents.
Test plan
mainand observe workflow execution🤖 Generated with Claude Code