Add workflow for automatic rebase. by DaniilKl · Pull Request #16 · TrenchBoot/.github

DaniilKl · 2026-04-09T08:09:23Z

No description provided.

DaniilKl · 2026-04-09T08:22:14Z

I am not sure why the actions launched the rebase.sh. This workflow is set up to be launched only when called by another workflow 😕 .

DaniilKl · 2026-04-09T09:32:10Z

I am not sure why the actions launched the rebase.sh. This workflow is set up to be launched only when called by another workflow 😕 .

It seems it was just an automatic check of the correctness of the rebase.yml, not the actual execution of the rebase.yml.

DaniilKl · 2026-04-13T14:49:19Z

I will have to add a few diagrams here, hence, switching to draft.

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

woodpecker-cli Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

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 · 2026-04-15T13:35:27Z

I will have to add a few diagrams here, hence, switching to draft.

Moving to "Ready for review" now, I will consider adding the diagrams to TrenchBoot docs instead, as the diagrams will describe an entire CI/CD infrastructure for automatic rebasing in TrenchBoot organization.

This seems to be a good place: https://trenchboot.org/dev-docs/ .

m-iwanicki · 2026-04-17T13:46:43Z

+        with:
+          repository: TrenchBoot/.github
+          path: shared
+          ref: master


Wouldn't you want the same ref as this workflow was called with?

No I do not see a reason, unless there is a custom change to the rebase.sh that should be tested. But I have not found the way to redirect to the reusable workflow the ref it was called from. Because the reusable workflow inherits all the environment variables from the parent workflow (such as, for example github.sha, etc.). So for me the only way here is to use inputs to tell the reusable workflow about it, but I do not want to create yet another input just for that.

You are right, I got a little confused with how this would work with reusable workflow (and noticed there are GitHub issues related to exactly this)

No I do not see a reason, unless there is a custom change to the rebase.sh

I can't test it as rebase.sh doesn't exist on master currently :(

I have unresolved this thread, as it seems I have found the solution: https://docs.github.com/en/actions/reference/workflows-and-actions/contexts#example-usage-of-job-context-workflow-identity .

https://github.com/TrenchBoot/.github/compare/2ba4cf6c5b9e1a698ec71e6eaa8be992fd29f946..e51d845a11095ed012713d56a9387829524ee989

DaniilKl · 2026-04-21T18:05:29Z

I will need to do a squash at the end.

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl · 2026-04-21T19:51:22Z

I have found another corner case: 9501536 .

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

m-iwanicki · 2026-04-23T08:48:04Z

+          NAME: ${{ inputs.commit-user-name }}
+          EMAIL: ${{ inputs.commit-user-email }}
+          MESSAGE: ${{ inputs.cicd-trigger-resume }}
+        run: |


I think we should deal with return code 5 (nothing to rebase). I don't think failing job (red x) would look good. I think in that case rest of the jobs should be skipped

IMO differentiating between a rebase success and nothing to rebase could be useful, so instead of modifying the script, I have modified the reusable workflow: b70dcd6 . But now I need to check the rebase-exit-code in the calling workflows.

I have modified all workflows that use this reusable workflow so far:

https://github.com/TrenchBoot/grub/compare/54dee6b34d817d1d847757985cf00f15c6488a8a..f69ced86bdff240364570e59ef8ea20561d6702d

https://github.com/TrenchBoot/qubes-antievilmaid/compare/703c199cecfdff5094cb42ed289e01735456481f..fcf825c6925d3ce39d75b75054ecefeea763fcab

https://github.com/TrenchBoot/xen/compare/ae91a9bac0ae3a17155f044417ee34a044103280..dc90373568fb0051d8460943db8e0207641abfec

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

code 5 should be treated as a success Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl self-assigned this Apr 9, 2026

DaniilKl force-pushed the add-rebase-script branch 2 times, most recently from 427cb2b to 5eae06d Compare April 9, 2026 09:30

DaniilKl force-pushed the add-rebase-script branch 7 times, most recently from 4437fe8 to 94a562f Compare April 10, 2026 09:14

DaniilKl marked this pull request as ready for review April 10, 2026 09:29

DaniilKl requested a review from macpijan April 10, 2026 09:29

DaniilKl commented Apr 10, 2026

View reviewed changes

Comment thread .github/workflows/rebase.yml Outdated

This was referenced Apr 10, 2026

.github: workflows: add rebasing workflows TrenchBoot/grub#32

Open

.github: workflows: rebase-and-build.yml: add TrenchBoot/qubes-antievilmaid#15

Open

.github: workflows: rebase-and-build.yml: add TrenchBoot/xen#26

Open

DaniilKl force-pushed the add-rebase-script branch from 700c34b to 8b0f413 Compare April 13, 2026 10:34

DaniilKl marked this pull request as draft April 13, 2026 14:49

DaniilKl force-pushed the add-rebase-script branch 5 times, most recently from ed03c87 to 55245e6 Compare April 15, 2026 13:27

DaniilKl added 4 commits April 15, 2026 15:33

.github: workflows: rebase.yml: add; scripts: rebase.sh: add

8bb75cf

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

Add CI/CD workflow and a script for triggering Woodpecker workflow via

58e44a1

woodpecker-cli Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

.github: workflows: qubes-dom0-packagev2.yml: add qubes-component-branch

382f529

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl force-pushed the add-rebase-script branch from 55245e6 to 0de7bf6 Compare April 15, 2026 13:33

DaniilKl marked this pull request as ready for review April 15, 2026 13:35

DaniilKl requested review from SergiiDmytruk and m-iwanicki April 15, 2026 13:35

This was referenced Apr 15, 2026

Public availability of automatically built TrenchBoot packages integrated on top of the QubesOS upstream TrenchBoot/trenchboot-issues#83

Open

.github: workflows: qubesos.yml: add trigger-woodpecker-cicd job for signing TrenchBoot/secure-kernel-loader#26

Open

m-iwanicki requested changes Apr 17, 2026

View reviewed changes

SergiiDmytruk reviewed Apr 21, 2026

View reviewed changes

Comment thread README.md Outdated

Comment thread .github/workflows/rebase.yml Outdated

Comment thread scripts/rebase.sh Outdated

Comment thread scripts/rebase.sh Outdated

Comment thread scripts/rebase.sh Outdated

Address review

ed96075

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl force-pushed the add-rebase-script branch from 69ac4e4 to ed96075 Compare April 21, 2026 18:19

scripts: rebase.sh: add empty commits handling

9501536

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

scripts: rebase.sh: add a note about empty commits

2d9d77c

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

m-iwanicki requested changes Apr 22, 2026

View reviewed changes

m-iwanicki requested changes Apr 23, 2026

View reviewed changes

.github: workflows: update actions/checkout to v6

08b43ea

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl force-pushed the add-rebase-script branch 3 times, most recently from 8a88744 to 2ba4cf6 Compare April 27, 2026 07:46

scripts: rebase.sh: Address review

e51d845

Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

DaniilKl force-pushed the add-rebase-script branch from 2ba4cf6 to e51d845 Compare April 27, 2026 08:02

.github: workflows: rebase.yml: add rebase-exit-code output, the return

b70dcd6

code 5 should be treated as a success Signed-off-by: Danil Klimuk <daniil.klimuk@3mdeb.com>

This was referenced Apr 29, 2026

.github: workflows: build-rc.yml: add TrenchBoot/xen#30

Open

.github: workflows: build-rc.yml: add TrenchBoot/grub#33

Open

.github: workflows: build-rc.yml: add TrenchBoot/qubes-antievilmaid#16

Open

Conversation

DaniilKl commented Apr 9, 2026

Uh oh!

DaniilKl commented Apr 9, 2026

Uh oh!

DaniilKl commented Apr 9, 2026

Uh oh!

Uh oh!

DaniilKl commented Apr 13, 2026

Uh oh!

DaniilKl commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DaniilKl Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaniilKl commented Apr 21, 2026

Uh oh!

DaniilKl commented Apr 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DaniilKl commented Apr 15, 2026 •

edited

Loading

DaniilKl Apr 21, 2026 •

edited

Loading