merge queue: checking main (0199bd5) and #12416 together - #12481
Closed
mergify[bot] wants to merge 3 commits into
Closed
merge queue: checking main (0199bd5) and #12416 together#12481mergify[bot] wants to merge 3 commits into
mergify[bot] wants to merge 3 commits into
Conversation
The CI Insights setup pages and the two matrix helpers disagreed with each other about how to override the job name a test report is filed under, and none of them said where the default comes from. The three setup pages now name `MERGIFY_TEST_JOB_NAME` — the variable the CLI reads, and the one every framework plugin (pytest, rspec, vitest) already documents — say where the default comes from on each provider (`GITHUB_JOB` on GitHub Actions, Jenkins' own `JOB_NAME`, the step label on Buildkite), and show where to set it. They also state why it matters: the job name is part of a test's identity, so a scheduled run that reports a different name splits its results off from the pull request ones. The GitHub Actions matrix case is stated the way it actually breaks: every leg of a matrix reports the same job name because they share one `GITHUB_JOB`. The old text left the reader to infer why an override was needed at all. The two matrix helpers keep recommending the native override — the action's `job_name` input and the Buildkite plugin's `job_name` property. Both currently export `MERGIFY_JOB_NAME`, which no uploader reads, so neither takes effect today; that is a bug in the three producers of that variable, not something the docs should route readers around. Fixing them is tracked separately, and the snippets pin moving tags (the action's `v25`, the plugin's `#v1`), so readers pick the fix up when those tags move. The pytest, rspec and vitest pages already agreed with this and are unchanged. Settles Mergifyio/ci-bot#369. Part of MRGFY-8720 Change-Id: I96e06bb4500bf9e7664d36d941ef0d962004e9a9
The JUnit and TestNG recipes told Gradle users to configure their report output
with a `reports { junitXml.enabled = true; junitXml.destination = ... }` block.
Gradle 8.0 removed both of those properties ("The deprecated `destination`, and
`enabled` properties of the `Report` type have been removed", per Gradle's own
upgrade notes), so on any current Gradle that block fails the build. A reader
following either page was stopped at the very first step, before ever reaching
the upload step.
Nothing needs to replace it. Gradle's `test` task already writes JUnit XML to
`build/test-results/test/`, which is the path both pages then tell the reader to
upload, so the block was configuring the default. It goes, the default location
is stated instead, and only the line that does have to be there stays:
`useJUnitPlatform()` for JUnit 5, `useTestNG()` for TestNG.
That also settles the version question the recipe would otherwise have to
answer, since `useJUnitPlatform()` and `useTestNG()` are accepted by every
Gradle version anyone is running.
Settles Mergifyio/ci-bot#370. The same broken block was in the TestNG recipe,
which that issue did not mention.
Part of MRGFY-8720
Change-Id: I24b7f2d8324397dd1371a46550777fc658995b54
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 (0199bd5) and #12416 are queued together for merge.
This pull request has been created by Mergify to check the mergeability of #12416.
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:depends-on = Mergifyio/docs#12415[⛓️ fix(ci-insights): name the job-name variable the uploader actually reads #12415]github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]schedule=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)(?:\(.+\))?!?:👀 Review Requirements]:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/Required conditions to stay in the queue:
depends-on = Mergifyio/docs#12415[⛓️ fix(ci-insights): name the job-name variable the uploader actually reads #12415]github-review-approved[🛡 GitHub repository ruleset ruleRequire pull request for default branch]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-bot-head ~= ^docs-agent/📕 PR description]:body ~= (?ms:.{48,})🔎 Reviews]:#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0🤖 Continuous Integration]:check-success = buildcheck-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/author != dependabot[bot]author != mergify-ci-bothead ~= ^docs-agent/