.github: workflows: rebase-and-build.yml: add#26
Merged
Conversation
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
976adbe to
e87d261
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
15e1a9d to
ea0cec8
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
ea0cec8 to
c268f01
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
c268f01 to
4976812
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
4976812 to
445d8b0
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
force-pushed
the
add-rebase-workflow
branch
3 times, most recently
from
93194e3 to
7f4daed
Compare
m-iwanicki
requested changes
Apr 17, 2026
m-iwanicki
left a comment
m-iwanicki
left a comment
There was a problem hiding this comment.
- Pass commit message through a spellchecker
m-iwanicki
requested changes
Apr 17, 2026
m-iwanicki
reviewed
Apr 20, 2026
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
7f4daed to
754e1ea
Compare
Contributor
Author
Done. |
DaniilKl
force-pushed
the
add-rebase-workflow
branch
3 times, most recently
from
7d08327 to
9e91e1e
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
4e4efd2 to
a12e070
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
2 times, most recently
from
bf52c84 to
ae91a9b
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
ae91a9b to
dc90373
Compare
DaniilKl
force-pushed
the
add-rebase-workflow
branch
3 times, most recently
from
57a4f67 to
cbd5166
Compare
Contributor
Author
|
@m-iwanicki, @SergiiDmytruk, ping for review. |
m-iwanicki
requested changes
May 19, 2026
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
cbd5166 to
d7c372b
Compare
m-iwanicki
requested changes
May 19, 2026
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
d7c372b to
85acd90
Compare
We cannot simply rebase commits from TrenchBoot/xen on top of the commits in the QubesOS/qubes-vmm-xen, because: 1. The actual history for the xen component is held in patches in the QubesOS/qubes-vmm-xen 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-vmm-xen, except for the patches for the xen component, as versions of these files might be closely related to the changes in the patches for the xen component. Other changes that should be done due to the history format difference between the QubesOS/qubes-vmm-xen and TrenchBoot/xen should be resolved by TrenchBoot maintainers in the same way as it was done in the following commit: TrenchBoot/grub@2f477ee Except for the above, there are three workarounds: 1. The "Fix malformed patch header (split URL line in 0627 patch)", otherwise git will not apply the patch. 2. Renaming QubesOS/qubes-vmm-xen/config to TrenchBoot/xen/config-qubesos, so it will not conflict with an already existing directory "config" in the xen source code. 3. Renaming QubesOS/qubes-vmm-xen/xen.spec.in to QubesOS/qubes-vmm-xen/vmm-xen.spec.in. This is done because the qubes-dom0-packagev2.yml expects the file to have a name ${{ inputs.qubes-component }}.spec.in and the correct name for this component in QubesOS is vmm-xen, not xen. Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
85acd90 to
22b19e7
Compare
m-iwanicki
approved these changes
May 28, 2026
SergiiDmytruk
approved these changes
May 28, 2026
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
4 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 .