Repository navigation
Conversation
Prepares Java CI for a GitHub merge queue (apache#20471, apache#19612). The queue itself is enabled later through .asf.yaml. - New ci.yml owns the triggers (pull_request, merge_group, push, workflow_dispatch) and calls bot.yml and java_ci_engines.yml as reusable workflows. Its Required Checks job reports on every PR and queue run, and fails unless both called workflows succeed. - Only push keeps the path filter: a required check must report on every PR, and a selector job would add a second runner wait. - Concurrency moves to ci.yml. Pushes are keyed by SHA so queue merge bursts never replace a pending master run; only PR runs cancel. - Codecov steps skip merge_group runs, which would file coverage under master for commits that may never land. - validate_source.yml also reports on merge_group, and never cancels queue runs.
This was referenced Oct 29, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #20473 +/- ##
============================================
- Coverage 80.59% 80.34% -0.26%
+ Complexity 35951 35794 -157
============================================
Files 2575 2575
Lines 147254 147254
Branches 18098 18098
============================================
- Hits 118678 118305 -373
- Misses 20361 20662 +301
- Partials 8215 8287 +72
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
This branch has not been deployed
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.
Describe the issue this Pull Request addresses
Two PRs that each pass CI can still break master together, since nothing re-tests them against the master they land on. A merge queue fixes that, but needs one required check reporting on every PR and queue group; today's Java CI is two path-filtered workflows, so neither can hold one.
Part of #20471 (and #19612). The queue itself is turned on in a follow-up
.asf.yamlPR, once this one has shownRequired Checksreporting.Summary and Changelog
Java CI now runs through one workflow,
ci.yml, which is ready formerge_groupevents.ci.ymlowns the triggers (pull_request, merge_group, push, workflow_dispatch) and callsbot.ymlandjava_ci_engines.ymlas reusable workflows. Their jobs are unchanged.Required Checksjob: reports on every PR and queue run, fails unless both called workflows succeed (a skip fails it too).Smaller changes
ci.yml. A called workflow sees its caller's name ingithub.workflow, so the two files would have shared one group. Pushes are keyed by SHA, so a burst of queue merges never replaces a pending master run; only PR runs cancel in progress.validate_source.ymlalso reports on merge_group and never cancels queue runs.ci.yml;.github/workflows/README.mdupdated.Impact
CI / Java CI / <job>andCI / Java CI Engines / <job>; none is required today.Risk Level
low. No job body changes apart from the Codecov conditions, and nothing required changes until the
.asf.yamlfollow-up.Documentation Update
none (
.github/workflows/README.mdupdated)Contributor's checklist