Open
Conversation
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
7d50661 to
4278b94
Compare
DaniilKl
commented
Apr 10, 2026
DaniilKl
commented
Apr 10, 2026
DaniilKl
commented
Apr 10, 2026
DaniilKl
force-pushed
the
add-rebase-workflow
branch
3 times, most recently
from
94dd17d to
a2fbc4e
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
a2fbc4e to
5325440
Compare
DaniilKl
added a commit
to TrenchBoot/.github
that referenced
this pull request
Apr 15, 2026
This is because it is being used in other TrenchBoot repos as well but on other branches because of: TrenchBoot/grub#32 TrenchBoot/qubes-antievilmaid#15 TrenchBoot/xen#26 IMHO there is no reason to mention every use of this workflow. Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
5325440 to
53c0f27
Compare
DaniilKl
added a commit
to TrenchBoot/.github
that referenced
this pull request
Apr 15, 2026
This is because it is being used in other TrenchBoot repos as well but on other branches because of: TrenchBoot/grub#32 TrenchBoot/qubes-antievilmaid#15 TrenchBoot/xen#26 IMHO there is no reason to mention every use of this workflow. Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
added a commit
to TrenchBoot/.github
that referenced
this pull request
Apr 15, 2026
This is because it is being used in other TrenchBoot repos as well but on other branches because of: TrenchBoot/grub#32 TrenchBoot/qubes-antievilmaid#15 TrenchBoot/xen#26 IMHO there is no reason to mention every use of this workflow. Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
added a commit
to TrenchBoot/.github
that referenced
this pull request
Apr 15, 2026
This is because it is being used in other TrenchBoot repos as well but on other branches because of: TrenchBoot/grub#32 TrenchBoot/qubes-antievilmaid#15 TrenchBoot/xen#26 IMHO there is no reason to mention every use of this workflow. Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
commented
Apr 15, 2026
DaniilKl
commented
Apr 15, 2026
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
35aed1c to
d5c69f9
Compare
DaniilKl
changed the title
DaniilKl
force-pushed
the
add-rebase-workflow
branch
3 times, most recently
from
02d3bc0 to
c3d5f15
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
c3d5f15 to
05719c9
Compare
Author
|
Though the review process can be continued, the final merge is blocked by the same reason as here. We do not want to rebase the |
SergiiDmytruk
requested changes
Apr 21, 2026
| env: | ||
| UPSTREAM_TAG: grub-${{ steps.version.outputs.version }} | ||
| run: | | ||
| git remote add upstream https://git.savannah.gnu.org/git/grub.git |
Member
There was a problem hiding this comment.
The repo has been moved to https://gitlab.freedesktop.org/gnu-grub/grub and the old one is apparently won't be synchronized (as if it's hard...).
| ref: 'aem-next-rebased' | ||
| - name: Read version of the QubesOS Component from version file | ||
| id: read-version | ||
| run: echo "version=$(cat version)" >> "$GITHUB_OUTPUT" |
| commit-user-name: 'github-actions[bot]' | ||
| commit-user-email: 'github-actions[bot]@users.noreply.github.com' | ||
| cicd-trigger-resume: '7. Rerun the workflow https://github.com/TrenchBoot/grub/actions/runs/${{ github.run_id }} to resume automated rebase.' | ||
| cleanup-after-rebase-attemp: |
Member
There was a problem hiding this comment.
Suggested change
| cleanup-after-rebase-attemp: | |
| cleanup-after-rebase-attempt: |
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
36be4c4 to
9a34c93
Compare
DaniilKl
commented
Apr 22, 2026
Regarding the "rebase.yml". We cannot simply rebase commits from TrenchBoot/grub on top of the commits in the QubesOS/qubes-grub2, because: 1. The actual history for the grub component is held in patches in the QubesOS/qubes-grub2 repository, so we need to do a conversion from patches to commits every time we want to try to rebase. 2. We want to track the changes to the other files from the QubesOS/qubes-grub2, except for the patches for the grub component, as versions of these files might be closely related to the changes in the patches for the grub component. Other changes that should be made due to the history format difference between the QubesOS/qubes-grub2 and TrenchBoot/grub should will be resolved by the follwoing commit when the actual rebase happens: 2f477ee Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
9a34c93 to
9bba50b
Compare
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
2 participants
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.
Related to: TrenchBoot/.github#16 .