Skip to content

Promote develop to main: adoption-feedback batch, hygiene checks, canonical fixes - #407

Merged
ptr727 merged 3 commits into
mainfrom
develop
Jul 23, 2026
Merged

Promote develop to main: adoption-feedback batch, hygiene checks, canonical fixes#407
ptr727 merged 3 commits into
mainfrom
develop

Conversation

@ptr727

Copy link
Copy Markdown
Owner

Promotes the develop line to main. Merge-commit promotion (not squash); develop is the head and is never deleted.

Included (3 commits)

  • Codify central MSBuild config for C# and the workspace-file editing rule #404 — CODESTYLE "Central Build and Package Configuration" (Directory.Build.props + Directory.Packages.props) with the csharp.centralconfig.props audit check; the absolute never-edit-an-active-.code-workspace rule in the verbatim-carried Verification Discipline; three new audit checks (cspell workspace duplication, HISTORY-mirrors-README, About-description-mirrors-intro).
  • Document why configure.sh apply suppresses write stdout #405 — the configure.sh stdout-suppression rationale in the canonical (kills the recurring downstream review flag).
  • Apply the PhotoCleaner round-1 feedback batch #406 — the PhotoCleaner round-1 feedback batch: MD033 text corrected, xUnit dynamic-skip carve-out, canonical JSON reindented to 4-space, ancestry-vs-content corrections (report/driftNote/template), codecov claims both stores, copilot-instructions manifest gains sections incl. the review runbook.

Why now

The PhotoCleaner round-2 convergence vendors canonicals from main — this makes them current (CODESTYLE, Verification Discipline, configure.sh, version.json, settings.json, plus the new checks).

Verification

validate.py green, --selftest passes, trial merge conflict-free (0 markers). Human merge — no release fires.

🤖 Generated with Claude Code

ptr727 added 3 commits July 23, 2026 09:06
…audit checks (#404)
CODESTYLE gains Central Build and Package Configuration (Directory.Build.props + Directory.Packages.props) with a matching csharp audit check; AGENTS.md Verification Discipline gains the never-edit-an-active-code-workspace rule; the audit gains three checks from maintainer ideas - cspell workspace duplication, HISTORY-mirrors-README opening, and About-description-mirrors-intro-line (link-free). All selftest-covered and live-verified.
Two-line rationale in the canonical at the top of cmd_apply (stdout-only, stderr untouched, fail-loud, check verifies the end state), so downstream carry reviews stop re-flagging the suppression.
Six downstream feedback items from the PhotoCleaner governance carry: MD033 text corrected, xUnit dynamic-skip carve-out adopted, canonical JSON reindented to 4-space, the ancestry-vs-content corrections (report, driftNote, template), codecov claims both stores (Dependabot-triggered runs read the Dependabot store), and the copilot-instructions manifest entry gains sections incl. the review runbook.
CopilotAI review requested due to automatic review settings July 23, 2026 16:32
@ptr727
ptr727 merged commit 9421198 into mainJul 23, 2026
7 checks passed

CopilotAI 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.

Pull request overview

Promotion PR that syncs main with the current develop governance/audit canonicals, incorporating recent adoption-feedback updates (CODESTYLE, audit checks, repo-config hygiene, and report/registry corrections).

Changes:

  • Extend the audit to validate README/HISTORY opening parity, README intro vs GitHub About description, and prevent duplicated CSpell word lists in workspace files.
  • Update governance docs and spec baselines (central MSBuild config guidance, markdownlint MD033 policy, xUnit dynamic-skip carve-out, Copilot instructions required sections).
  • Normalize canonicals and clean up drift documentation (JSON reindent, develop-vs-main “commit count” drift wording, registry drift note removal).

Reviewed changes

Copilot reviewed 11 out of 13 changed files in this pull request and generated 1 comment.

Show a summary per file
FileDescription
version.jsonReindent JSON to the 4-space canonical style (no behavioral change).
spec/secrets.jsonRequire CODECOV_TOKEN in both secret stores and document the rationale.
spec/readme-structure.mdClarify README intro constraints and define HISTORY.md mirroring expectations.
spec/project-types.jsonAdd a C# “central build/package config” expectation to the C# type checks.
spec/files.jsonRequire specific headings in .github/copilot-instructions.md via sections.
spec/audit.pyAdd new audit checks for README/HISTORY mirroring, About-description mirroring, and workspace CSpell duplication.
reports/photocleaner/audit.mdReframe develop/main “behind” as benign for merge-commit promotions (ancestry vs content).
reports/_template.mdUpdate the template guidance to classify develop/main drift by content, not commit count.
repo-config/settings.jsonReindent JSON to the 4-space canonical style.
repo-config/configure.shAdd rationale comment explaining stdout suppression for write calls.
registry/repos.jsonRemove the incorrect PhotoCleaner drift note about forward-syncing promotion merge commits.
CODESTYLE.mdUpdate markdownlint MD033 guidance; add central MSBuild config guidance; clarify xUnit dynamic-skip exception.
AGENTS.mdAdd “never edit an active .code-workspace file” to Verification Discipline.

Comment threadspec/secrets.json
Comment on lines +38 to +39
"stores": ["actions", "dependabot"],
"note": "A csharp or python repo lists CODECOV_TOKEN in its registry requiredSecrets (unlike the implicit baseline secrets). Both stores: a workflow run triggered by a Dependabot PR reads the Dependabot secrets store, so without that copy the coverage upload silently skips on every bot PR. Coverage upload is report-only by default (fail_ci_if_error: false, so a Codecov hiccup never fails the gate). A repo may enforce a stricter threshold (e.g. 99%+) on top of that default."
Sign up for freeto 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.

2 participants

@ptr727