Skip to content

Remove dummy DCO workflow for the merge queue - #605

Merged
llucax merged 5 commits into
frequenz-floss:v0.x.xfrom
llucax:dco-queue
Aug 11, 2026
Merged

Remove dummy DCO workflow for the merge queue#605
llucax merged 5 commits into
frequenz-floss:v0.x.xfrom
llucax:dco-queue

Conversation

@llucax

@llucax llucax commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

The DCO GitHub App now runs on merge queue (merge_group) events, so the "DCO" required status check no longer needs to accept a status from any integration and we don't need to ship a dummy workflow to run in the merge queue just to satisfy the DCO check.

Fixes #277 and #604.

@github-actions github-actions Bot added the part:template Affects the cookiecutter template files label Jul 23, 2026
@llucax llucax linked an issue Jul 23, 2026 that may be closed by this pull request
@llucax

llucax commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

@llucax llucax self-assigned this Jul 23, 2026
llucax added 5 commits August 11, 2026 11:08
The DCO GitHub App now runs on merge queue (merge_group) events, so the
"DCO" required status check no longer needs to accept a status from any
integration. Pin it to the DCO GitHub App (integration_id 1861) in the
"Protect version branches" ruleset exports.

Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
The DCO GitHub App did not use to run on merge queue (merge_group)
events, so a dummy workflow provided a passing "DCO" status check to
satisfy the required check when merging through the queue.

The DCO app now runs on merge_group events, making the dummy workflow
obsolete, so drop it from the template and regenerate all affected
golden fixtures.

Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
Mirror the template and ruleset changes so existing repositories pick
them up too.

Add two migration steps: one removes the obsolete
`.github/workflows/dco-merge-queue.yml` workflow, and one pins the "DCO"
required status check in the "Protect version branches" ruleset to the
DCO GitHub App (`integration_id` 1861) via the `gh` CLI. Both are
idempotent and report a manual step when the change cannot be applied
automatically.

Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
@llucax
llucax marked this pull request as ready for review August 11, 2026 09:56
@llucax
llucax requested a review from a team as a code owner August 11, 2026 09:56
@llucax
llucax requested review from daniel-zullo-frequenz and removed request for a team August 11, 2026 09:56
@llucax

llucax commented Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Ready for review. Upstream was fixed and the fix was confirmed.

@llucax
llucax enabled auto-merge August 11, 2026 09:56
@llucax
llucax requested a review from Marenz August 11, 2026 09:56

@daniel-zullo-frequenz daniel-zullo-frequenz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. I've seen double backticks like in gh in many places. If our documentation renders as markdown we can just use single backsticks instead (e.g. gh). We could add a note to AGENTS in case docstrings were generated by AI

@llucax
llucax added this pull request to the merge queue Aug 11, 2026
Merged via the queue into frequenz-floss:v0.x.x with commit 1899f0a Aug 11, 2026
8 checks passed
@llucax
llucax deleted the dco-queue branch August 11, 2026 16:25
@llucax

llucax commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

LGTM. I've seen double backticks like in gh in many places. If our documentation renders as markdown we can just use single backsticks instead (e.g. gh). We could add a note to AGENTS in case docstrings were generated by AI

Ah, dann, yeah, AI like to use reST in docstrings, will fix.

@llucax

llucax commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

OK, they are only in the migration script, which will be gone in the next release, so since this got merged already I don't think it is worth fixing.

@daniel-zullo-frequenz

Copy link
Copy Markdown
Contributor

OK, they are only in the migration script, which will be gone in the next release, so since this got merged already I don't think it is worth fixing.

Agree. But I think it's worth to add a short note to the AGENTS.md, maybe in conventions?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

part:template Affects the cookiecutter template files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove the dummy DCO workflow for the merge queue Do not generate dco-merge-queue.yml for private repos

3 participants