Merge stable into develop#9979
Closed
polmichel wants to merge 6 commits into
Closed
Conversation
Bump cAdvisor from gcr.io/cadvisor/cadvisor:v0.52.1 to ghcr.io/google/cadvisor:v0.60.5 in the observability docker-compose stack (standalone and standard variants). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: redesign release-notes navigation and landing feed
Replace the flat 114-entry release-notes sidebar with one collapsible
category per release line ("1.10 release", "1.9 release", ...), generated
from the release files by docs/sidebar-releases.ts, and replace the
DocCard generated-index at /release-notes/infrahub with a chronological
release feed: full detail for the two newest lines, compact rows for
earlier ones.
- Add release_date / release_type / description (and breaking) frontmatter
to all release files, with scripts/backfill-release-frontmatter.mjs to
backfill and --check them
- Add docs/plugins/release-notes-data.js exposing release frontmatter as
global data, consumed by the new <ReleaseFeed/> component
- Update the cut-release process docs for the new frontmatter contract
and the generated sidebar
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* docs: fix mangled identifiers in release-note descriptions
The `description:` frontmatter added in 917a8de was drafted by
docs/scripts/backfill-release-frontmatter.mjs, whose stripMd() removed `_`
along with the markdown emphasis characters. Changelog entries quote their
identifiers in backticks, so both the backticks and the underscores were
stripped: `order_weight` became "orderweight", `sso_user_default_group`
became "ssouserdefaultgroup", and so on. <ReleaseFeed/> renders description
as plain text, so those mangled names were shown to readers verbatim. Vale
was correctly flagging them.
- Stop stripping `_` in stripMd() so future drafts keep snake_case intact
- Reword the 17 affected descriptions as prose. Four of them referenced CLI
commands (`infrahub db check`, `infrahub upgrade`); the lowercase there was
correct, so they are rephrased rather than capitalized
- Whitelist Starlette, backfills and upserts, which are correct as written
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 6 to 7. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 6 to 7. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v6...v7) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…to-develop # Conflicts: # .agents/commands/cut-release.md
Adopt the auto-generated release-notes sidebar (docs/sidebar-releases.ts) from stable while keeping develop's git-tag-based versioning. Drop the stale docs/sidebars.ts staging and verification references, since a release no longer edits that file.
github-actions
Bot
added
type/documentation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #9976, which was blocked on merge conflicts.
Summary
Merges
stableintodevelop.Brings stable's release-notes docs redesign (auto-generated sidebar via
docs/sidebar-releases.ts, a chronological feed at/release-notes/infrahub, required frontmatter on all release files validated byscripts/backfill-release-frontmatter.mjs --check), the cAdvisor image bump (ghcr.io/google/cadvisor:v0.60.5), and theactions/setup-python/actions/setup-nodev7 bumps intodevelop.Conflicts resolved
.agents/commands/cut-release.md— stable and develop had diverged on this command doc: stable carried the newer release-notes redesign (frontmatter contract + auto-generated sidebar) but the olderpyproject.toml-bump versioning; develop carried the git-tag/hatch-vcs versioning model but a stale manual "Update Sidebar" step. Resolved by keeping develop's git-tag versioning throughout and adopting stable's auto-generated-sidebar section, then removing the now-deaddocs/sidebars.tsreferences from the release steps (git addin the commit step and the verification checklist). Grounded in the merged tree, which auto-generates the sidebar (docs/sidebar-releases.tspresent;docs/sidebars.tslists no release entries). (1db87c1e1)Conflicts raised for review
None requiring a decision. Two notes for the reviewer:
cut-release.mdresolution went slightly beyond the literal conflict markers to keep the doc internally consistent with the merged tree's generated-sidebar model (Steps 7–8 no longer stage/verifydocs/sidebars.ts).stableanddevelop; left untouched here to keep the merge focused — worth a follow-up tidy.Versioning
No version-pin conflict arose.
pyproject.toml/python_testcontainers/pyproject.tomlkept develop's dynamic (hatch-vcs) versioning; the staticfallback-versionsentinel is identical on both branches by design, so the usual stable→develop version conflict did not occur.uv.lockmerged cleanly.Validation
node scripts/backfill-release-frontmatter.mjs --check(fromdocs/) — passes for all 115 release filesactions/setup-python/actions/setup-nodeconsistently on v7 (the two remaining@v6refs are gh-aw.mdworkflow definitions, v6 on both branches — not a merge artifact)Backend unit/integration tests and
docs.validatewere not run: the merge changed no backend source, config, schema, events, or CLI files, so no backend generated files can be stale.Summary by cubic
Merge stable into develop to bring the release-notes docs redesign and CI/observability updates. Also aligns the release process doc with the generated sidebar while keeping develop’s git‑tag versioning.
New Features
docs/sidebar-releases.tsand a chronological feed at/release-notes/infrahub. All release files now requirerelease_date,release_type, anddescription(optionalbreaking) with validation viascripts/backfill-release-frontmatter.mjs --check. Updatedcut-release.mdto remove manualdocs/sidebars.tsedits and match the generated-sidebar model.Dependencies
actions/setup-pythonto v7 andactions/setup-nodeto v7 across workflows.ghcr.io/google/cadvisor:v0.60.5in the observability docker-compose files.Written for commit 1db87c1. Summary will update on new commits.