Adding rebase github action for rebasing a current branch#1324
Merged
Conversation
dmikusa
reviewed
Mar 20, 2026
| @@ -0,0 +1,82 @@ | |||
| #!/bin/bash | |||
Contributor
There was a problem hiding this comment.
Since you're just running a shell script, you don't have to have this action use a Dockerfile. That is just adding some overhead as it will need to build the container when you want to use this. See https://github.com/pacostas/builder-jammy-buildpackless-tiny/actions/runs/23195036484/job/67401012368
Just an FYI.
dmikusa
approved these changes
Mar 20, 2026
Member
Author
|
I see, Im just trying to be on the same pattern as the rest of the actions. |
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
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
This action has been tested here : https://github.com/pacostas/builder-jammy-buildpackless-tiny/actions/runs/23195036484
This PR:
rebase-branch. This action rebases the current checked out branch on the main branch. The main branch is passed as an argument with default value main, in case someone would like to use a different base branch (unlikely but there is not harm having it)update-builder-toml.ymlgithub action in order to use this action.In general I have noticed, that the builders most of the times do not get the latest updates on the builder.toml file, due to the branch despite has been updated, it has not been rebased. The purpose of this PR is to reduce the amount of work that is needed in order to rebase the PRs, wait for the tests to pass, aprove the PR due to a human has rebased it and it can not be merged automatically and then merge them. Also, this will practically end up to not be necessasry almost any human supervision, as in case the PR fails (e.g. network error during the tests of the PR), the rebase will help unblock the PR from this state and will manage to merge it automatically the next time that the
update-buidler-toml.ymlaction will run.Also, this action can be used across all other github-actions, but I think we can start small with the most important part, that is having the latest changes on the builders, as soon as possible. It will also gives us a better overview whether this action would need some improvement or not in terms of functionality.
Use Cases
Checklist