Skip to content

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Sep 16, 2025

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
@rjernst rjernst added the :Core/Infra/Core Core issues without another label label Sep 16, 2025
@rjernst rjernst requested a review from a team as a code owner September 16, 2025 20:47
@rjernst rjernst added >refactoring auto-backport Automatically create backport pull requests when merged v8.19.5 v9.1.5 v8.18.8 v9.0.8 labels Sep 16, 2025
@rjernst rjernst requested review from mark-vieira and removed request for a team September 16, 2025 20:48
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Sep 16, 2025
Copy link
Contributor

github-actions bot commented Sep 16, 2025

🔍 Preview links for changed docs

Copy link
Contributor

ℹ️ Important: Docs version tagging

👋 Thanks for updating the docs! Just a friendly reminder that our docs are now cumulative. This means all 9.x versions are documented on the same page and published off of the main branch, instead of creating separate pages for each minor version.

We use applies_to tags to mark version-specific features and changes.

Expand for a quick overview

When to use applies_to tags:

✅ At the page level to indicate which products/deployments the content applies to (mandatory)
✅ When features change state (e.g. preview, ga) in a specific version
✅ When availability differs across deployments and environments

What NOT to do:

❌ Don't remove or replace information that applies to an older version
❌ Don't add new information that applies to a specific version without an applies_to tag
❌ Don't forget that applies_to tags can be used at the page, section, and inline level

🤔 Need help?

t.into(resourceRoot + "/definitions", c -> c.from(generateManifestTask));
});

Consumer<GenerateTransportVersionDefinitionTask> generationConfiguration = t -> {
Copy link
Contributor

@mark-vieira mark-vieira Sep 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, if we made this an Action then we could make applying this to tasks slightly more ergonomic. Such as:

Action<MyTask> commonConfig = t -> { t.setGroup("foo") };
project.getTasks.register("myTask", MyTask.class, commonConfig).configure { 
  // unique config 
};

or

project.getTasks.register("myTask", MyTask.class, t -> {
  // unique config
}.configure(commonConfig);

Pick your preferred style.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot about this, I'll do it the next time I tweak this file.

@rjernst rjernst merged commit b287b47 into elastic:main Sep 16, 2025
33 of 34 checks passed
@rjernst rjernst deleted the transport/resolve_conflict_task branch September 16, 2025 23:20
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.19 Commit could not be cherrypicked due to conflicts
9.1 Commit could not be cherrypicked due to conflicts
8.18 Commit could not be cherrypicked due to conflicts
9.0 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 134842

mridula-s109 pushed a commit to mridula-s109/elasticsearch that referenced this pull request Sep 17, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
gmjehovich pushed a commit to gmjehovich/elasticsearch that referenced this pull request Sep 18, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Sep 25, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Sep 25, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Sep 25, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Sep 25, 2025
This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
elasticsearchmachine pushed a commit that referenced this pull request Sep 25, 2025
…35485)

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
elasticsearchmachine pushed a commit that referenced this pull request Sep 25, 2025
…35486)

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
elasticsearchmachine pushed a commit that referenced this pull request Sep 25, 2025
…35489)

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
rjernst added a commit that referenced this pull request Sep 26, 2025
…35487)

This commit moves the action for resolving merge conflicts in transport version files a separate task instead of a command line flag to generate.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged backport pending :Core/Infra/Core Core issues without another label >refactoring Team:Core/Infra Meta label for core/infra team v8.18.8 v8.19.5 v9.0.8 v9.1.5 v9.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants