Merge stable into develop#9978
Merged
Merged
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>
github-actions
Bot
added
type/documentation
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
1 issue found across 138 files
Confidence score: 4/5
- In
docs/docs/release-notes/infrahub/release-1_8_1.mdx, therelease_dateplaces 1.8.1 before 1.8.0, which can misorder release timelines and confuse users or any tooling that sorts releases chronologically; correct the patch release date so it is after 1.8.0 before merging.
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="docs/docs/release-notes/infrahub/release-1_8_1.mdx">
<violation number="1" location="docs/docs/release-notes/infrahub/release-1_8_1.mdx:3">
P2: Release 1.8.1 is a patch release on the 1.8.x line, but its `release_date` of 2026-03-19 is 3 days _before_ the 1.8.0 minor release (2026-03-22). A patch release cannot chronologically precede the minor release it patches. This frontmatter data appears to have been carried forward from the existing body table (which also says "March 19th, 2026"), but the inconsistency should be corrected during this backfill. The correct date for 1.8.1 should be after 2026-03-22, likely 2026-03-25—the same as 1.8.2's date—or another verified date if the 1.8.2 date is also off.</violation>
</file>
Shadow auto-approve: would not auto-approve because issues were found.
Re-trigger cubic
| @@ -1,5 +1,8 @@ | |||
| --- | |||
| title: Release 1.8.1 | |||
| release_date: 2026-03-19 | |||
Contributor
There was a problem hiding this comment.
P2: Release 1.8.1 is a patch release on the 1.8.x line, but its release_date of 2026-03-19 is 3 days before the 1.8.0 minor release (2026-03-22). A patch release cannot chronologically precede the minor release it patches. This frontmatter data appears to have been carried forward from the existing body table (which also says "March 19th, 2026"), but the inconsistency should be corrected during this backfill. The correct date for 1.8.1 should be after 2026-03-22, likely 2026-03-25—the same as 1.8.2's date—or another verified date if the 1.8.2 date is also off.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At docs/docs/release-notes/infrahub/release-1_8_1.mdx, line 3:
<comment>Release 1.8.1 is a patch release on the 1.8.x line, but its `release_date` of 2026-03-19 is 3 days _before_ the 1.8.0 minor release (2026-03-22). A patch release cannot chronologically precede the minor release it patches. This frontmatter data appears to have been carried forward from the existing body table (which also says "March 19th, 2026"), but the inconsistency should be corrected during this backfill. The correct date for 1.8.1 should be after 2026-03-22, likely 2026-03-25—the same as 1.8.2's date—or another verified date if the 1.8.2 date is also off.</comment>
<file context>
@@ -1,5 +1,8 @@
---
title: Release 1.8.1
+release_date: 2026-03-19
+release_type: patch
+description: "Added schema processing to schema integrity check in order to validate the schema (8355)"
</file context>
Addresses the cubic review on #9978: - Correct env-var / parameter names missing underscores in release descriptions: 1.1.2 INFRAHUB_PUBLIC_URL; 1.2.1 and 1.2.9 INFRAHUB_SCHEMA_STRICT_MODE / INFRAHUB_TESTING_SCHEMA_STRICT_MODE; 1.3.1 min_value/max_value/excluded_values. - Fix description typos: 1.1.6 "cop" -> "copy"; 1.4.3 missing sentence break; 1.3.3 drop the leaked "<!-- vale off -->" directive. - 1.5.0: replace the generic placeholder description (identical to 1.4.0's) with a release-specific summary. - 1.8.0: correct release_date to 2026-03-16 to match the infrahub-v1.8.0 tag, in both frontmatter and the body table. 1.8.1 (2026-03-19) was already correct and is left unchanged; cubic's suggestion to change 1.8.1 was based on the wrong 1.8.0 date. - backfill-release-frontmatter.mjs: make --check fail on files with no frontmatter block, and serialize descriptions via JSON.stringify so backslashes/quotes stay valid YAML. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…to-develop-sj03k # Conflicts: # .agents/commands/cut-release.md
…idebar Same resolution as the prior merge: adopt stable's "Verify Sidebar Generation" step and drop develop's now-stale manual docs/sidebars.ts references from the commit (Step 7) and verify (Step 8) steps, keeping develop's tag-based release flow and stable's frontmatter contract. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fatih-acar
force-pushed
the
fac/merge-stable-into-develop-sj03k
branch
from
July 21, 2026 09:12
38090a0 to
f7cef40
Compare
fatih-acar
marked this pull request as ready for review
July 21, 2026 09:44
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
stableintodevelopon a fresh integration branch offdevelop.Net delta over
developis confined to docs, CI workflow config, and observability compose files — no backend or frontend/app source changes:docs/sidebar-releases.ts,ReleaseFeedcomponent/feed at/release-notes/infrahub, required frontmatter on release files +scripts/backfill-release-frontmatter.mjs).actions/setup-python→ v7 andactions/setup-node→ v7 across CI/release/chromatic/agent workflows (+ regenerated*.lock.yml).ghcr.io/google/cadvisor.Conflicts resolved
.agents/commands/cut-release.md— semantic conflict.stable's release-notes redesign (docs: redesign release-notes navigation and landing feed #9969) made the docs sidebar auto-generated (docs/sidebars.tsimportsgenerateInfrahubReleaseSidebar; no manual release-notes entries), whiledevelopstill documented a manual "Update Sidebar" step. Resolved by adoptingstable's "Verify Sidebar Generation" step and removingdevelop's now-stale manualdocs/sidebars.tsreferences from the commit step (Step 7) and verify list (Step 8), while preservingdevelop's tag-based release flow andstable's frontmatter contract. (38090a0c0)The merge commit (
e80c48f0f) records the conflict markers; the resolution lands as a separate reviewable diff (38090a0c0) on top.Conflicts raised for review
cut-release.mdresolution above was surfaced and confirmed before resolving (it spans a refactor:stablerestructured the sidebar mechanism, sodevelop's manual-sidebar edits no longer applied). The extra cleanup of the two non-conflicted-but-staledocs/sidebars.tsreferences (Steps 7/8) is included so the merged doc matches the actual codebase.Validation
node scripts/backfill-release-frontmatter.mjs --check— passes (113 release files).cut-release.mdis conflict-marker-free and markdown-lint clean.docs/requires ≥24) — left to CI. No generated files regenerated (no backend/frontend source in the delta).🤖 Generated with Claude Code
Summary by cubic
Merge
stableintodevelopwith a release-notes docs redesign, CI action bumps, and observability image updates. No backend or frontend source changes.Refactors
docs/sidebar-releases.tsand a newReleaseFeedat/release-notes/infrahub.release_date,release_type,description(optionalbreaking); check withscripts/backfill-release-frontmatter.mjs --check..agents/commands/cut-release.mdto “Verify Sidebar Generation” and removed manualdocs/sidebars.tsedits; keeps the tag-based release flow.Dependencies
actions/setup-pythonto v7 andactions/setup-nodeto v7 across workflows (includingci,chromatic, agents, and doc jobs).ghcr.io/google/cadvisorin observability compose files.Written for commit f7cef40. Summary will update on new commits.