Skip to content

Prepare Repository for Merge Queue #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opajonk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prepare Repository for Merge Queue #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Copy link

@JP-ETAS JP-ETAS Feb 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could make a new workflow merge-queue.yaml and call this workflow from that one. This would mean you don't need your overall-result job as you could just use the merge-queue.yaml workflow status directly.

Would also be clear in the code if someone wanted to extend the merge queue tests in the future

Copy link
Contributor Author

@opajonk opajonk Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must say I am not a fan of workflows including workflows... it just starts to be convoluted really quickly, and I need to jump between files when editing, think about branches, etc.

Here, I'd argue the workflow is really short enough and we should not use multiple files.

We can discuss the naming of the steps, though. I am not entirely happy yet. I like solutions like described here. What do you think?

Copy link
Contributor Author

@opajonk opajonk Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, admittedly it is possible to omit the branch ref if it is in the same repository. And it should probably be done almost always, unless one wants to run into weird issues. But again - here, the workflow is so short... why add complexity.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- main
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -18,10 +19,12 @@ jobs:
os: [arm64, amd64]
include:
- os: amd64
name: DevContainer (amd64)
name: build/amd64
description: DevContainer (amd64)
runner: ubuntu-24.04
- os: arm64
name: DevContainer (arm64)
name: build/arm64
description: DevContainer (arm64)
runner: ubuntu-24.04-arm

name: ${{ matrix.name }}
Expand Down Expand Up @@ -73,6 +76,20 @@ jobs:
./scripts/publish.sh --${{ matrix.os }} "main"
fi

overall-result:
name: build/overall-result
description: Overall Result
runs-on: ubuntu-24.04
needs: [build/amd64, build/arm64]
if: ${{ !cancelled() }}
steps:
- name: Successful verification
if: ${{ !(contains(needs.*.result, 'failure')) }}
run: exit 0
- name: Failing verification
if: ${{ contains(needs.*.result, 'failure') }}
run: exit 1

merge:
name: Merge Labels (main only)
needs: [build]
Expand Down