Skip to content

fix(pr-template): generalize org-wide PR template - #68

Merged
sbaerlocher merged 2 commits into
mainfrom
fix/pr-template-generalize
Aug 7, 2026
Merged

fix(pr-template): generalize org-wide PR template#68
sbaerlocher merged 2 commits into
mainfrom
fix/pr-template-generalize

Conversation

@sbaerlocher

Copy link
Copy Markdown
Member

Summary

  • Replace the fixed role checklist (Alloy, DO, Tailscale) with a free-form ## Affected Component(s) list — the checklist came from ansible.agent and is meaningless in every other repository the org-wide template applies to.
  • Remove the trailing comment block: it thanked contributors for the wrong repository and carried an attribution line the commit conventions forbid, which every PR in the organization inherited.
  • Apply both changes to the copy under templates/ so the org-wide default and the bootstrap source for new repositories stay in sync.

The duplication itself was checked for replacement by a symlink and deliberately kept: templates/ is copied out into new repositories, where a link pointing back into this repo would not resolve, and GitHub reads only the root file for the org-wide default.

Test plan

  • Rendered template no longer names roles specific to a single collection
  • No attribution line or wrong-repository reference remains in either copy
  • Both copies are byte-identical
  • CI green

Comment thread pull_request_template.md

@claude claude Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The template change itself is correct and well-scoped: the role-specific checklist is genuinely meaningless for the org-wide default, the removed comment block referenced the wrong repo, and both copies are byte-identical as verified.

One open item: this changes a template inherited by every org repository, but there's no matching CHANGELOG.md entry. AGENTS.md lists updating CHANGELOG.md under Do, and the rolling CHANGELOG already tracks template-level changes. Please add a dated entry describing the generalization.

claude[bot]
claude Bot previously approved these changes Aug 7, 2026

@claude claude Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

All raised issues have been addressed — the CHANGELOG entry is now in place.

The template was copied from ansible.agent verbatim, so every PR in the
organization opened with a role checklist naming only that collection's
roles and a footer thanking contributors for the wrong repository while
carrying an attribution line the commit conventions forbid.

Both copies are kept in sync: the root file is the org-wide default, the
one under templates/ is the bootstrap source for new repositories.

Signed-off-by: Simon Bärlocher <s.baerlocher@sbaerlocher.ch>
AGENTS.md requires template-level changes to appear in the rolling
changelog so consumer repositories can see them.

Signed-off-by: Simon Bärlocher <s.baerlocher@sbaerlocher.ch>

@claude claude Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

All raised issues have been addressed. The security fixes in security-code.yml (env-passthrough for inputs, package-manager allowlist, printf-based summary) are correct, the pre-build-commands removal is properly documented, and the CHANGELOG entry covers all changes.

@sbaerlocher
sbaerlocher merged commit 01f5229 into main Aug 7, 2026
1 check passed
@sbaerlocher
sbaerlocher deleted the fix/pr-template-generalize branch August 7, 2026 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant