Skip to content

fix(vdev): release tooling fixes from #25442#25629

Open
pront wants to merge 1 commit into
masterfrom
fix/release-tooling-improvements
Open

fix(vdev): release tooling fixes from #25442#25629
pront wants to merge 1 commit into
masterfrom
fix/release-tooling-improvements

Conversation

@pront

@pront pront commented Jun 15, 2026

Copy link
Copy Markdown
Member

Summary

Small release tooling fixes, partially extracted from #25442.

Fix dry-run branch creation in vdev release prepare

--dry-run previously still called git fetch and checkout_main_branch, requiring a clean remote checkout. Those steps are now skipped in dry-run mode so the command works from any local branch.

Fix insert_block_after_changelog inserting at the wrong position

When a CUE release file contains a nested array that closes before the changelog: array, the old code inserted the VRL changelog block at the first ] it encountered. Now tracks entry into the changelog: block before looking for the closing ].

Drop scope parsing from the release CUE generator

Scopes were used by older release page layouts (pre-~0.30) to render blue badges on vector.dev. The current release page template does not render them. Removes the scopes field from ConventionalParts and Commit, simplifies the regex, and drops scopes from the CUE output. The CUE schema retains the field (defaulting to []) so existing release files continue to validate.

Vector configuration

NA

How did you test this PR?

  • cargo test -p vdev

Change Type

  • Bug fix
  • New feature
  • Dependencies
  • Non-functional (chore, refactoring, docs)
  • Performance

Is this a breaking change?

  • Yes
  • No

Does this PR include user facing changes?

  • Yes. Please add a changelog fragment based on our guidelines.
  • No. A maintainer will apply the no-changelog label to this PR.

References

@github-actions github-actions Bot added the domain: vdev Anything related to the vdev tooling label Jun 15, 2026
@pront pront added the no-changelog Changes in this PR do not need user-facing explanations in the release changelog label Jun 15, 2026
@pront pront marked this pull request as ready for review June 15, 2026 17:31
@pront pront requested review from a team as code owners June 15, 2026 17:31

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ff8f31528f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vdev/src/commands/release/generate_cue.rs Outdated
@pront pront force-pushed the fix/release-tooling-improvements branch 2 times, most recently from 96bbcd3 to 2475df4 Compare June 15, 2026 20:21

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2475df421f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vdev/src/commands/release/prepare.rs Outdated
@pront pront force-pushed the fix/release-tooling-improvements branch from 059209a to 1e9a6c3 Compare June 15, 2026 20:32

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1e9a6c3971

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread vdev/src/commands/release/generate_cue.rs
Comment thread vdev/src/commands/release/generate_cue.rs Outdated
@pront pront force-pushed the fix/release-tooling-improvements branch 3 times, most recently from 0e2c9aa to 456dc5d Compare June 15, 2026 20:59
- Fix dry-run branch creation in 'vdev release prepare'. Previously,
  --dry-run still called git fetch and checkout_main_branch, requiring a
  clean remote checkout. Now those steps are skipped in dry-run mode so
  the command works from any local branch. A warning surfaces the current
  HEAD branch and the commit range that will be used, so a stale or
  feature branch can't silently land unrelated commits in the generated
  release CUE.

- Fix insert_block_after_changelog inserting the VRL changelog block at
  the wrong position when another array closes before the changelog
  array. Now tracks whether we are inside the changelog: block before
  looking for the closing ].

- Drop scope parsing from the release CUE generator. Scopes were used by
  older release page layouts (pre-~0.30) to render blue badges on
  vector.dev but the current release template does not render them.
  Removes the scopes field from ConventionalParts and Commit, simplifies
  the regex, and drops scopes from the CUE output. The schema retains
  the field (defaulting to []) so existing release files continue to
  validate.
@pront pront force-pushed the fix/release-tooling-improvements branch from 456dc5d to 98b1885 Compare June 15, 2026 21:02
@pront pront added this pull request to the merge queue Jun 15, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

domain: vdev Anything related to the vdev tooling no-changelog Changes in this PR do not need user-facing explanations in the release changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants