merge queue: checking main (a32dfe1) and #1723 together#1727
Closed
mergify[bot] wants to merge 2 commits into
Closed
merge queue: checking main (a32dfe1) and #1723 together#1727mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
…y renames `queue_metadata::parse_yaml_block` modeled the MQ draft-PR-body payload with a rigid serde struct whose `draft_pr_number` was required. The engine (MRGFY-8075) renamed that key to `batch_pr_number` and dual-emits both for one release window before dropping the old spelling. A missing required field fails the *whole document*, and the caller's `.ok()` swallows that into `None`, so once the alias is gone every batch body with a non-empty `previous_failed_batches` would silently cost `git-refs` its `checking_base_sha` and diff against the wrong base, with no error surfaced anywhere. That struct has been dead code since #1600: its only reader, `git_refs`, uses just `checking_base_sha`; every other field is parsed and discarded. So rather than a `#[serde(alias)]` band-aid on one key, parse the payload into a generic `serde_json::Value` — exactly how the git-note twin (`git::read_note`) already reads the identical payload — and pull `checking_base_sha` out with the existing shared helper. The CLI is now immune to any engine key rename in this block, with no schema left to drift and no call-site churn. While here: warn instead of silently falling through to the PR base when MQ metadata is present but carries no `checking_base_sha`, so a future rename of that key can't degrade the base silently either; and share the YAML-mapping parse between the note and PR-body readers so they can't diverge in what they accept. Fixes MRGFY-8104 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Change-Id: I6732b7057db0c98a7bb275d95fbd6470e39bad8b
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
1 participant
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (a32dfe1) and #1723 are queued together for merge.
This pull request has been created by Mergify to check the mergeability of #1723.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:github-review-approved[🛡 GitHub branch protection] (documentation)github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch] (documentation)Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success=ci-gateRequired conditions to stay in the queue:
base=maingithub-review-approved[🛡 GitHub branch protection] (documentation)github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch] (documentation)label!=manual mergeEnforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by>=2author = dependabot[bot]author = mergify-ci-botauthor = renovate[bot]📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success=ci-gate