Skip to content

Promote develop to main: hub conformance round 2 - #34

Merged
ptr727 merged 0 commit into
mainfrom
develop
Aug 1, 2026
Merged

Promote develop to main: hub conformance round 2#34
ptr727 merged 0 commit into
mainfrom
develop

Conversation

@ptr727

@ptr727 ptr727 commented Aug 1, 2026

Copy link
Copy Markdown
Owner

Promotes the 2026-08-01 hub-conformance round to main. Eight commits, seventeen files, no functional change to the application.

What is in it

PR Change
#26 gruntfuggly.todo-tree (abandoned) to fanaticpythoner.better-todo-tree, the fleet-standard extension
#27 Re-vendored .markdownlint-cli2.jsonc and repo-config/configure.sh, both stale against the canonical
#28 Split the agent instruction set: AGENTS.md becomes a 73-line router, new GOVERNANCE.md carries 18 topical sections
#29 Added the validate-release entry gate and re-vendored the github-release job
#30 README and HISTORY brought to the fleet structure; one canonical description across six surfaces
#31 Dropped the unused nugetPackageVersion block from version.json
#32 + #33 Docker Hub short-description mechanism, added then reverted. Net zero; the two commits cancel

Two changes that are not cosmetic

validate-release closes a contract gap. WORKFLOW.md already specified this job in section 4, in guarantee D2.2, and in scenarios S1, S4, and S10 - and it did not exist. The contract named a job nothing implemented, so S10 could never have been caught. It now fails a release before anything is built, and it gained the arm the old inline check lacked: a non-main branch whose version carries no prerelease suffix now fails, which is the develop-published-as-stable case.

Every Docker example in the README was broken. They invoked organize, which is not a subcommand; the CLI defines process, undo, import, index, trash (PhotoCleaner/CommandLine.cs:55-59). import is the one declaring --outpath. Found by Copilot review on #30 and swept across all four call sites.

Versioning

No version.json bump. This round is conformance, CI, and documentation, and the Release Model bumps the 2-digit line only for a functional change by maintainer instruction. NBGV advances the patch from git height, so the next publish cuts 1.0.<height> with no edit.

What happens after this merges

Merging publishes nothing: publish-release.yml runs on workflow_dispatch and a weekly schedule only, never on push. The next scheduled run (Mon 02:00 UTC, main only) will cut a GitHub release at the new NBGV version, refresh the multi-arch image, and push the updated Docker Hub overview from Docker/README.md.

The Docker Hub short description is unchanged and stays stale for now. Wiring it is a fleet-wide mechanism affecting every docker project, so it belongs to the hub rather than to this repo; the hub is working out a deterministic approach. That is why #32 was reverted, and it is the one open audit finding against develop.

Verification

  • Merge dry-run into main applies with zero conflicts; no EOL trap on these paths.
  • Every constituent PR carried a Copilot review on its head SHA with all threads resolved before merging.
  • Hub audit against develop@1ab0f11 (audit run 2026-08-01T17:24:48Z | hub 0e00496) returns one finding, the Docker Hub short description above. Every other finding from the opening run is cleared.
  • dotnet test: 324 passed, 0 failed. Build clean at 0 warnings with TreatWarningsAsErrors.
  • markdownlint, cspell, actionlint, and editorconfig-checker all clean.

Issue #14 stays open deliberately: this round closed its conformance findings, but the merge-bot and the date badge were never built.

Copilot AI review requested due to automatic review settings August 1, 2026 18:16

Copilot AI 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.

Pull request overview

Promotes the current develop hub-conformance round to main, aligning governance, documentation, and CI/repo-configuration artifacts with the fleet baseline while keeping application behavior unchanged.

Changes:

  • Introduces the split governance model (AGENTS.md router + new GOVERNANCE.md) and retargets cross-references accordingly.
  • Updates the release workflow orchestration to include a validate-release entry gate and improves GitHub release asset handling via expect_release_assets.
  • Refreshes README/HISTORY/Docker description surfaces and corrects Docker usage examples to use import (not organize).

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated no comments.

Show a summary per file
File Description
WORKFLOW.md Retargets governance cross-references from AGENTS.md to GOVERNANCE.md.
version.json Removes unused nugetPackageVersion block.
repo-config/README.md Updates branching-model links and references to GOVERNANCE.md.
repo-config/configure.sh Hardens ruleset lookup and adds explicit failure guards for safer apply/check behavior.
README.md Brings README structure in line with fleet conventions and fixes Docker examples to use import.
PhotoCleaner/CommandLine.cs Updates root command description to match the canonical README intro sentence.
PhotoCleaner.code-workspace Replaces abandoned TODO-tree extension recommendation with better-todo-tree.
HISTORY.md Aligns header/intro with README and adds the 1.0 release entry.
GOVERNANCE.md Adds the new fleet governance rulebook (split from the prior monolithic agent instructions).
Docker/README.md Aligns Docker Hub overview intro sentence with the canonical README intro.
Docker/Dockerfile Updates image label description to the canonical intro sentence.
CODESTYLE.md Retargets process-rule references to GOVERNANCE.md and adds the repo-specific post-change verification set.
AUDIT.md Updates prose authorities and branching-model references to GOVERNANCE.md.
AGENTS.md Converts AGENTS.md into the slim router + context/delegation discipline entry point.
.markdownlint-cli2.jsonc Allows <details>/<summary> while keeping MD033 otherwise enforced.
.github/workflows/build-release-task.yml Adds validate-release gate and expect_release_assets to close the release-contract gap and support Docker-only repos.
.github/copilot-instructions.md Updates references to the new governance split and adds guidance for reviewing carried fleet content.

@ptr727
ptr727 merged this pull request into main Aug 1, 2026
14 checks passed
ptr727 added a commit that referenced this pull request Aug 3, 2026
Promote develop to main: hub conformance round 2
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.

2 participants