Skip to content

Keep template-only bits out of synced repos - #13

Merged
sbglasius merged 2 commits into
mainfrom
fix/template-only-conventions-step
Oct 13, 2026
Merged

sbglasius merged 2 commits into
mainfrom
fix/template-only-conventions-step

Conversation

@sbglasius

Copy link
Copy Markdown
Collaborator

Fixes found while reviewing the first sync PR to gpc/grails-export (gpc/grails-export#61).

Changes

  • ci.yml: the Test convention plugins step only runs in the template repo. Synced repos no longer have conventions/, so the step failed there. verify-repository.groovy now fails if a ci.yml build step runs against conventions/ without that guard.
  • renovate.json: drop the conventions/... paths. The generic build.gradle / gradle.properties patterns already match conventions/build.gradle and conventions/gradle.properties, and the precompiled scripts carry no dependency coordinates.
  • gradlew.bat: commit it with CRLF line endings and add a .gitattributes entry (gradlew.bat -text) so the sync no longer rewrites it to LF in target repos.

Test plan

  • groovy .github/scripts/verify-repository.groovy passes
  • Removing the guard makes the verify script fail with a clear message
  • git ls-files --eol gradlew.bat shows i/crlf w/crlf attr/-text
  • Next sync keeps CRLF in a target's gradlew.bat

- Guard ci.yml's conventions test step so it only runs in the template repo,
  and make verify-repository enforce that guard.
- Drop the conventions/ paths from renovate.json; the generic build.gradle
  and gradle.properties patterns already cover conventions/ in the template.
- Commit gradlew.bat with CRLF line endings and mark it -text so the sync
  stops converting it to LF.
@github-actions github-actions Bot added the bug Something isn't working label Oct 13, 2026
gh pr merge --auto merges immediately when a repository has no required
checks, so a failing change landed before CI ran. Wait for the pull request's
checks instead and leave it open if they fail, time out or are absent.
@sbglasius
sbglasius merged commit b8aaf04 into main Oct 13, 2026
5 checks passed
@sbglasius
sbglasius deleted the fix/template-only-conventions-step branch October 13, 2026 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant