From 201ac9bce0657aa5a2f003768cfa69c2de633130 Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Sat, 23 May 2026 08:57:51 +0200 Subject: [PATCH] fix(sync): drop per-app description re-stamping note from auto-PR body MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After #56 retired the cosmetic-deviation allowance, the canonical files sync byte-for-byte including descriptions. The auto-generated PR body on each fleet sync still told reviewers to re-stamp per-app description strings — that's now wrong. Replace with explicit 'no manual post-merge step needed' guidance. Also linked the new policy doc (docs/canonical-files.md) so downstream reviewers can find the rules without bouncing through ADR-033. --- .github/workflows/sync-canonical-to-fleet.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sync-canonical-to-fleet.yml b/.github/workflows/sync-canonical-to-fleet.yml index bab1b59..96c4c58 100644 --- a/.github/workflows/sync-canonical-to-fleet.yml +++ b/.github/workflows/sync-canonical-to-fleet.yml @@ -85,14 +85,20 @@ jobs: Automated sync of canonical root configs from [`nextcloud-app-template`](https://github.com/ConductionNL/nextcloud-app-template). - See [hydra ADR-033](https://github.com/ConductionNL/hydra/blob/development/openspec/architecture/adr-033-root-config-consolidation.md) - for the consolidation policy. + See the + [canonical-files policy](https://github.com/ConductionNL/nextcloud-app-template/blob/development/docs/canonical-files.md) + and [hydra ADR-033](https://github.com/ConductionNL/hydra/blob/development/openspec/architecture/adr-033-root-config-consolidation.md) + for the rules. - ## Post-merge action required + ## No manual post-merge step - If `phpcs.xml` or `phpmd.xml` was changed, restore the per-app - description / ruleset-name string (this is the only allowed - cosmetic deviation from canonical — see ADR-033). + The canonical files sync byte-for-byte — including their + `` and `` strings. The template + uses app-generic descriptions ("Conduction Nextcloud app + coding standard…") on purpose so no per-app re-stamping is + needed. If you find yourself wanting to edit anything in + this PR before merging, that's a sign the change should go + back to the template first. ## Test plan - [ ] CI green (phpcs/psalm/phpstan/phpmd against this app's `lib/`)