Skip to content

Conversation

@cgwalters
Copy link
Contributor

Add automatic rebase workflow that triggers when the needs-rebase label is added to a pull request. This provides a secure way to trigger rebases since only users with triage or write permissions can add labels.

The workflow uses the app token for permissions and removes the label after the rebase attempt completes.

Assisted-by: Claude Code (Sonnet 4.5)

Add automatic rebase workflow that triggers when the needs-rebase label
is added to a pull request. This provides a secure way to trigger rebases
since only users with triage or write permissions can add labels.

The workflow uses the app token for permissions and removes the label
after the rebase attempt completes.

Assisted-by: Claude Code (Sonnet 4.5)
Signed-off-by: Colin Walters <walters@verbum.org>
@gemini-code-assist
Copy link

Summary of Changes

Hello @cgwalters, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces an automated rebase workflow to streamline the process of keeping feature branches up-to-date with the base branch. By simply adding a needs-rebase label, contributors can trigger a secure, automated rebase, reducing manual effort and ensuring a cleaner commit history. This enhances developer efficiency and maintains code quality by simplifying branch synchronization.

Highlights

  • New GitHub Actions Workflow: A new workflow named 'Automatic Rebase' has been introduced, located at common/.github/workflows/rebase.yml.
  • Automated Rebase Trigger: This workflow automatically triggers a rebase operation on a pull request when the needs-rebase label is applied to it.
  • Secure Authentication: The rebase process utilizes a GitHub App token for authentication, ensuring secure execution with appropriate permissions.
  • Label Management: After the rebase attempt, the workflow automatically removes the needs-rebase label from the pull request.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@cgwalters
Copy link
Contributor Author

Tested this over here bootc-dev/ci-sandbox#20 (comment) - works well!

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a new GitHub Actions workflow to automatically rebase pull requests when the needs-rebase label is applied. The approach of using a GitHub App token for permissions is secure and well-implemented. My review focuses on updating the versions of the GitHub Actions used in the workflow. Some of the specified versions are outdated and rely on deprecated Node.js versions, while others point to non-existent versions which would cause the workflow to fail. I've provided suggestions to update them to their latest stable versions to ensure the workflow is robust and maintainable.

types: [labeled]

permissions:
contents: read

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think rebasing would also need write perms?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it does, but we end up using the app token for this which bypasses this.

That said, it's probably safer to use GITHUB_TOKEN? From the docs on https://github.com/peter-evans/rebase it looks like it might work

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good, let's go for it then:)

@cgwalters cgwalters merged commit c1d7918 into bootc-dev:main Nov 21, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants