From fcf825c6925d3ce39d75b75054ecefeea763fcab Mon Sep 17 00:00:00 2001 From: Danil Klimuk Date: Mon, 13 Apr 2026 16:41:28 +0200 Subject: [PATCH 1/2] .github: workflows: add automatic rebasing and building workflows For the information on how does it work, check the https://github.com/TrenchBoot/.github . Signed-off-by: Danil Klimuk --- .../rebase-build-and-publish-rebased.yml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/rebase-build-and-publish-rebased.yml diff --git a/.github/workflows/rebase-build-and-publish-rebased.yml b/.github/workflows/rebase-build-and-publish-rebased.yml new file mode 100644 index 0000000..08f274d --- /dev/null +++ b/.github/workflows/rebase-build-and-publish-rebased.yml @@ -0,0 +1,57 @@ +name: Rebase and build the last successful automatic rebase of main branch + +on: + workflow_dispatch: + inputs: + dry_run: + description: > + Set this input to do a dry run without building the packages to test + the rebase. + required: false + type: boolean + default: false + schedule: + - cron: '0 0 * * 6' + +concurrency: + group: automatic-rebase + +jobs: + try-rebase: + uses: TrenchBoot/.github/.github/workflows/rebase.yml@v1 + secrets: + first-remote-token: ${{secrets.TRENCHBOOT_REBASE_TOKEN}} + permissions: + # For creation/deletion/pushing to branches and creating PRs + contents: write + with: + downstream-repo: 'https://github.com/TrenchBoot/qubes-antievilmaid.git' + downstream-branch: 'main' + upstream-repo: 'https://github.com/QubesOS/qubes-antievilmaid.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/qubes-antievilmaid/actions/runs/${{ github.run_id }} to resume automated rebase.' + antievilmaid: + needs: try-rebase + if: ${{ needs.try-rebase.outputs.rebase-exit-code == '0' && inputs.dry_run != 'true' }} + uses: TrenchBoot/.github/.github/workflows/qubes-dom0-packagev2.yml@v1 + with: + qubes-component: 'antievilmaid' + qubes-component-branch: 'main-rebased' + trigger-woodpecker-cicd: + needs: antievilmaid + uses: TrenchBoot/.github/.github/workflows/trigger-woodpecker-pipeline.yml@v1 + secrets: + woodpecker-token: ${{ secrets.WOODPECKER_TOKEN }} + with: + api-url: 'https://ci.3mdeb.com' + owner: 'zarhus' + repo: 'trenchboot-release-cicd-pipeline' + ref: 'master' + inputs: >- + --input GITHUB_REPO=qubes-antievilmaid + --input GITHUB_SHA=${{ github.sha }} + --input GITHUB_RUN_ID=${{ github.run_id }} + --input QUBES_COMPONENT=antievilmaid + --input WORKFLOW=sign-and-publish-test-rpms From abb2d2e7ab7b02a2239484464a791d9c45aa7999 Mon Sep 17 00:00:00 2001 From: Danil Klimuk Date: Wed, 29 Apr 2026 10:03:55 +0200 Subject: [PATCH 2/2] .github: workflows: rebase-build-and-publish-rebased.yml Remove job that pushes artifacts to current-testing RPM repository. For now only the RC builds should push there. Signed-off-by: Danil Klimuk --- .../rebase-build-and-publish-rebased.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/rebase-build-and-publish-rebased.yml b/.github/workflows/rebase-build-and-publish-rebased.yml index 08f274d..010f532 100644 --- a/.github/workflows/rebase-build-and-publish-rebased.yml +++ b/.github/workflows/rebase-build-and-publish-rebased.yml @@ -39,19 +39,3 @@ jobs: with: qubes-component: 'antievilmaid' qubes-component-branch: 'main-rebased' - trigger-woodpecker-cicd: - needs: antievilmaid - uses: TrenchBoot/.github/.github/workflows/trigger-woodpecker-pipeline.yml@v1 - secrets: - woodpecker-token: ${{ secrets.WOODPECKER_TOKEN }} - with: - api-url: 'https://ci.3mdeb.com' - owner: 'zarhus' - repo: 'trenchboot-release-cicd-pipeline' - ref: 'master' - inputs: >- - --input GITHUB_REPO=qubes-antievilmaid - --input GITHUB_SHA=${{ github.sha }} - --input GITHUB_RUN_ID=${{ github.run_id }} - --input QUBES_COMPONENT=antievilmaid - --input WORKFLOW=sign-and-publish-test-rpms