Skip to content

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Sep 17, 2025

Backports the following commits to 9.1:

Running on windows has some slightly different behavior when interacting
with the filesystem. In particular, this commit fixes the changed
resources prefix when looking at changed resources in git to always use
forward slashes as git outputs them. It also fixes the case that CI uses
a non-main (eg master) branch as the default branch. Finally it fixes
git diff so it outputs paths relative to the transport resources dir, as
ls-files does.
@rjernst rjernst added the :Core/Infra/Core Core issues without another label label Sep 17, 2025
@rjernst rjernst requested a review from a team as a code owner September 17, 2025 18:40
@rjernst rjernst added >test Issues or PRs that are addressing/adding tests auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Core/Infra Meta label for core/infra team test-windows Trigger CI checks on Windows labels Sep 17, 2025
@elasticsearchmachine elasticsearchmachine merged commit 6b6f45c into elastic:9.1 Sep 17, 2025
42 checks passed
@rjernst rjernst deleted the backport/9.1/pr-134739 branch September 17, 2025 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Core/Infra/Core Core issues without another label Team:Core/Infra Meta label for core/infra team >test Issues or PRs that are addressing/adding tests test-windows Trigger CI checks on Windows v9.1.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants