.github: workflows: rebase-and-build.yml: add#32
Draft
Conversation
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
810e700 to
7d50661
Compare
Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>
DaniilKl
force-pushed
the
add-rebase-workflow
branch
from
7d50661 to
4278b94
Compare
DaniilKl
commented
Apr 10, 2026
|
|
||
| jobs: | ||
| try-rebase: | ||
| uses: TrenchBoot/.github/.github/workflows/rebase.yml@add-rebase-script |
Author
There was a problem hiding this comment.
Suggested change
| uses: TrenchBoot/.github/.github/workflows/rebase.yml@add-rebase-script | |
| uses: TrenchBoot/.github/.github/workflows/rebase.yml@master |
This change must be applied after all the testing is done.
DaniilKl
commented
Apr 10, 2026
| qubes-pkg-version: '2.13' | ||
| trigger-gitea-cicd: | ||
| needs: qubes-dom0-package | ||
| uses: TrenchBoot/.github/.github/workflows/trigger-gitea-workflow.yml@add-rebase-script |
Author
There was a problem hiding this comment.
Suggested change
| uses: TrenchBoot/.github/.github/workflows/trigger-gitea-workflow.yml@add-rebase-script | |
| uses: TrenchBoot/.github/.github/workflows/trigger-gitea-workflow.yml@master |
This change must be applied after all the testing is done.
DaniilKl
commented
Apr 10, 2026
Comment on lines
+9
to
+23
| try-rebase: | ||
| uses: TrenchBoot/.github/.github/workflows/rebase.yml@add-rebase-script | ||
| secrets: | ||
| first-remote-token: ${{secrets.TOKEN}} | ||
| permissions: | ||
| # For creation/deletion/pushing to branches and creating PRs | ||
| contents: write | ||
| with: | ||
| downstream-repo: 'https://github.com/trenchboot/grub.git' | ||
| downstream-branch: 'tb-dev' | ||
| upstream-repo: 'https://github.com/QubesOS/qubes-grub2.git' | ||
| upstream-branch: 'main' | ||
| 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.' |
Author
There was a problem hiding this comment.
The rebasing for the grub component wont work this way, as the QubesOS changes are stored not as commits but as patches from the https://github.com/QubesOS/qubes-grub2.git repository . Hence the flow should be similar to:
First job
- Clone the
grubupstream repository. - Apply the patches from the https://github.com/QubesOS/qubes-grub2.git on the appropriate version of
grubusinggit am. - Push it to the https://github.com/trenchboot/xen.git under appropriate branch.
Second job
- Call the
rebase.ymlwith the branch from the first job.
Third job
- Call
qubes-dom0-packagev2.ymlso it will build RPM from a branch created in the second job.
Fourth job
- Trigger Gitea CI/CD for signing.
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
1 participant
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 .