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 <[email protected]>

woodpecker-cli Signed-off-by: Danil Klimuk <[email protected]>

Signed-off-by: Danil Klimuk <[email protected]>

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 <[email protected]>

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-17T12:59:50Z

+    commits1_num=$(printf '%s' "$commits1" | wc -l)
+    commits2_num=$(printf '%s' "$commits2" | wc -l)


This will return 0 for both 0 and 1 commit

m-iwanicki · 2026-04-17T13:02:04Z

+if  [[ "$BRANCH" != "$CONFLICT_BRANCH" ]]; then
+    git branch "$CONFLICT_BRANCH" &> /dev/null
+    if [[ "$LOCAL" != "true" && -n "$TOKEN" ]]; then
+        push_branch_remote "$TOKEN" "$CONFLICT_BRANCH" "$FIRST_REPO_REMOTE_NAME" || exit 1


I think || exit 1 is unneeded with set -e

m-iwanicki · 2026-04-17T13:26:19Z

+
+    # The remote URL must contain the token for the ref to be modified on the
+    # remote via personal access token authentication:
+    git remote get-url "$remote" 2> /dev/null | grep -F "$token" &> /dev/null || return 1


If this fails, how do we debug it? I have same issue in other places where you hide logs with &>/dev/null.

m-iwanicki · 2026-04-17T13:29:42Z

+
+# Download woodpecker-cli and register cleanup on exit:
+download_woodpecker_cli "$WOODPECKER_CLI_VERSION"
+trap cleanup EXIT


This should be a first instruction

m-iwanicki · 2026-04-17T13:30:27Z

+# versions.
+WOODPECKER_CLI_VERSION="${WOODPECKER_CLI_VERSION:-3.13.0}"
+WP_BIN=""
+WP_TMPDIR=""


Maybe keep everything together? E.g. function definitions first, then variables, then code. It's too easy to miss something between functions otherwise, especially in longer scripts

m-iwanicki · 2026-04-17T13:34:49Z

+SUCCESSULL_REBASE_PR_TITLE="Automatic rebase of branch $FIRST_REPO_BRANCH completed successfuly"
+SUCCESSULL_REBASE_MESSAGE="


typo (should be successful)

m-iwanicki · 2026-04-17T13:36:18Z

+        result="$(python3 -c "import sys, json; print(len(json.load(sys.stdin)))" <<< "$response")"
+    fi
+
+    if [ $result -eq 0 ]; then


Suggested change

if [ $result -eq 0 ]; then

if [ "$result" -eq 0 ]; then

m-iwanicki · 2026-04-17T13:38:01Z

+            -w|--workflow)
+                WORKFLOW="$2"
+                shift 2
+                ;;


m-iwanicki · 2026-04-17T13:38:09Z

+API_URL=""
+OWNER=""
+REPO=""
+WORKFLOW=""


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?

m-iwanicki · 2026-04-17T13:47:14Z

+                            specified multiple times.
+
+Environment variables:
+  WOODPECKER_CLI_VERSION    woodpecker-cli version to download (default: 2.7.0)


Suggested change

WOODPECKER_CLI_VERSION woodpecker-cli version to download (default: 2.7.0)

WOODPECKER_CLI_VERSION woodpecker-cli version to download (default: 3.13.0)

m-iwanicki · 2026-04-17T13:50:14Z

@@ -0,0 +1,170 @@
+#!/bin/bash


Is this used by anyone or just for local dev?

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 <[email protected]>

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

58e44a1

woodpecker-cli Signed-off-by: Danil Klimuk <[email protected]>

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

382f529

Signed-off-by: Danil Klimuk <[email protected]>

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

		commits1_num=$(printf '%s' "$commits1" \| wc -l)
		commits2_num=$(printf '%s' "$commits2" \| wc -l)

		SUCCESSULL_REBASE_PR_TITLE="Automatic rebase of branch $FIRST_REPO_BRANCH completed successfuly"
		SUCCESSULL_REBASE_MESSAGE="

	WOODPECKER_CLI_VERSION woodpecker-cli version to download (default: 2.7.0)
	WOODPECKER_CLI_VERSION woodpecker-cli version to download (default: 3.13.0)

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!

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!

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!

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!

2 participants

DaniilKl commented Apr 15, 2026 •

edited

Loading