Skip to content

[ES|QL] FORK now can be run on only one branch#267712

Merged
sddonne merged 1 commit into
elastic:mainfrom
sddonne:fix-fork-validation
May 6, 2026
Merged

[ES|QL] FORK now can be run on only one branch#267712
sddonne merged 1 commit into
elastic:mainfrom
sddonne:fix-fork-validation

Conversation

@sddonne
Copy link
Copy Markdown
Contributor

@sddonne sddonne commented May 5, 2026 •
edited by kibanamachine
Loading

Summary

After elastic/elasticsearch#136805, FORK can be run using a single branch.

Removed the "Must include at least two branches" validation.
image

The pipe is now suggested after the first branch.

@sddonne sddonne added Feature:ES|QL ES|QL related features in Kibana Team:ESQL ES|QL related features in Kibana t// backport:version Backport to applied version labels v9.5.0 v9.4.0 v9.3.0 release_note:skip Skip the PR/issue when compiling release notes labels May 5, 2026
@sddonne sddonne changed the title [ES|QL] FORK now works with only one branch [ES|QL] FORK now can be run on only one branch May 5, 2026
@sddonne sddonne marked this pull request as ready for review May 5, 2026 13:11
@sddonne sddonne requested a review from a team as a code owner May 5, 2026 13:11
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 5, 2026

💛 Build succeeded, but was flaky

Failed CI Steps

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
@kbn/esql-language 243 242 -1

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
kbnUiSharedDeps-srcJs 4.2MB 4.2MB -307.0B
Unknown metric groups

API count

id before after diff
@kbn/esql-language 268 267 -1

@sddonne sddonne merged commit c743a2f into elastic:main May 6, 2026
88 checks passed
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 6, 2026

Starting backport for target branches: 9.3, 9.4

https://github.com/elastic/kibana/actions/runs/25421704635

@kibanamachine kibanamachine mentioned this pull request May 6, 2026
Merged
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented May 6, 2026

💔 Some backports could not be created

Status Branch Result
❌ 9.3 Backport failed because of merge conflicts
✅ 9.4

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 267712

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request May 6, 2026
@kibanamachine @sddonne
[9.4] [ES|QL] FORK now can be run on only one branch (#267712) (#267890)
7ea8d66 
# Backport

This will backport the following commits from `main` to `9.4`:
- [[ES|QL] FORK now can be run on only one branch
(#267712)](#267712)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Sebastian Delle
Donne","email":"sebastian.delledonne@elastic.co"},"sourceCommit":{"committedDate":"2026-05-06T07:15:08Z","message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620","branchLabelMapping":{"^v9.5.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Feature:ES|QL","Team:ESQL","backport:version","v9.3.0","v9.4.0","v9.5.0"],"title":"[ES|QL]
FORK now can be run on only one
branch","number":267712,"url":"https://github.com/elastic/kibana/pull/267712","mergeCommit":{"message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620"}},"sourceBranch":"main","suggestedTargetBranches":["9.3","9.4"],"targetPullRequestStates":[{"branch":"9.3","label":"v9.3.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.4","label":"v9.4.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.5.0","branchLabelMappingKey":"^v9.5.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/267712","number":267712,"mergeCommit":{"message":"[ES|QL]
FORK now can be run on only one branch (#267712)\n\n## Summary\nAfter
elastic/elasticsearch#136805, FORK can be\nrun
using a single branch.\n\nRemoved the \"Must include at least two
branches\" validation.\n<img width=\"1144\" height=\"360\"
alt=\"image\"\nsrc=\"https://github.com/user-attachments/assets/2ce81fec-51d6-46c5-b562-8f068ab5ee40\"\n/>\n\nThe
pipe is now suggested after the first
branch.","sha":"c743a2f1d6cece659b7547272c747c9914f21620"}}]}]
BACKPORT-->

Co-authored-by: Sebastian Delle Donne <sebastian.delledonne@elastic.co>
@kibanamachine kibanamachine mentioned this pull request May 6, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@momovdg momovdg momovdg approved these changes

Assignees

No one assigned

Labels

backport:version Backport to applied version labels Feature:ES|QL ES|QL related features in Kibana release_note:skip Skip the PR/issue when compiling release notes Team:ESQL ES|QL related features in Kibana t// v9.3.0 v9.4.0 v9.5.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sddonne @kibanamachine @momovdg