merge queue: checking main (9126fe8), #12367 and #12366 together - #12374
Closed
mergify[bot] wants to merge 4 commits into
Closed
merge queue: checking main (9126fe8), #12367 and #12366 together#12374mergify[bot] wants to merge 4 commits into
mergify[bot] wants to merge 4 commits into
Conversation
The Ruleset Rule Compatibility table put "Used by Merge Protections" in the `required_deployments` behavior column, directly under two rows reading "Injected as conditions". Readers compared the rows and concluded Mergify turns the rule into a merge condition and holds a pull request until the required deployment succeeds. It does not: the rule is never injected, for the merge action or the merge queue. There is nothing for the table to say about it, so the row goes and the rule joins the Ignored Rule Types list, which already carries the right message: Mergify will not enforce these, ensure GitHub does. The intro made the same blanket claim one level up and now says Mergify injects the supported rules as conditions. Fixes MRGFY-8644 Change-Id: Id4da85649474e01415e299033832bf04154a172b
The `ci` scope was one line about uploading test results and CI Insights data. A `ci` key also quarantines and unquarantines tests, which decides whether a failing test blocks a merge, and it works on every repository of the account with no GitHub repository role attached. A customer handing that key to their pipeline had no way to know. Audited the engine routes that accept a `ci` key and rewrote both scope bullets from that set. The `admin` bullet was wrong too: it claimed full access to all API endpoints, but the results upload and the Merge Queue Scopes call accept a `ci` key only. Two other errors on the page, found while checking the above: - The `GET /v1/application` response example was stale: the API returns a UUID `id`, a `scope` field and `account_scope`, not an integer `id` and a `github_account` object. - The GitHub PAT example called `GET /v1/application`, the one endpoint on the page that rejects PATs. `merge-queue/scopes.mdx` showed its curl with a generic application key, where only a `ci` key works. Fixes MRGFY-8645 Change-Id: Ib2790d83483a3d371b595eca06742a010d8ef087
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
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 (9126fe8), #12367 and #12366 are queued together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #12366.
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 repository ruleset ruleRequire pull request for default branch]ciapplication key scope actually grants #12366schedule=Mon-Fri 09:00-17:30[Europe/Paris]Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:ciapplication key scope actually grants #12366👀 Review Requirements]:#approved-reviews-by >= 2ciapplication key scope actually grants #12366author = dependabot[bot]ciapplication key scope actually grants #12366author = mergify-ci-botciapplication key scope actually grants #12366-head ~= ^docs-agent/ciapplication key scope actually grants #12366📕 PR description]:body ~= (?ms:.{48,})ciapplication key scope actually grants #12366🔎 Reviews]:#changes-requested-reviews-by = 0ciapplication key scope actually grants #12366#review-requested = 0ciapplication key scope actually grants #12366#review-threads-unresolved = 0ciapplication key scope actually grants #12366🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linksciapplication key scope actually grants #12366check-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/ciapplication key scope actually grants #12366Required conditions to stay in the queue:
github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]ciapplication key scope actually grants #12366Enforce conventional commit]:title ~= ^(fix|feat|internal|docs|style|refactor|perf|test|build|ci|chore|revert|ui)(?:\(.+\))?!?:ciapplication key scope actually grants #12366👀 Review Requirements]:#approved-reviews-by >= 2ciapplication key scope actually grants #12366author = dependabot[bot]ciapplication key scope actually grants #12366author = mergify-ci-botciapplication key scope actually grants #12366-head ~= ^docs-agent/ciapplication key scope actually grants #12366📕 PR description]:body ~= (?ms:.{48,})ciapplication key scope actually grants #12366🔎 Reviews]:#changes-requested-reviews-by = 0ciapplication key scope actually grants #12366#review-requested = 0ciapplication key scope actually grants #12366#review-threads-unresolved = 0ciapplication key scope actually grants #12366🤖 Continuous Integration]:check-success = buildciapplication key scope actually grants #12366check-success = lintciapplication key scope actually grants #12366check-success = testciapplication key scope actually grants #12366check-success = test-broken-linksciapplication key scope actually grants #12366label = ignore-broken-linksciapplication key scope actually grants #12366check-success=Cloudflare Pagesciapplication key scope actually grants #12366-head-repo-full-name~=^Mergifyio/ciapplication key scope actually grants #12366author != dependabot[bot]ciapplication key scope actually grants #12366author != mergify-ci-botciapplication key scope actually grants #12366head ~= ^docs-agent/ciapplication key scope actually grants #12366