Skip to content

Conversation

pquentin
Copy link
Member

As you can see in #5342, we currently validate backports PRs against the main branch, which creates huge diffs. #5341 will make this even worse. This should fix it when backported.

Copy link
Contributor

Following you can find the validation changes against the target branch for the APIs.

No changes detected.

You can validate these APIs yourself by using the make validate target.

@pquentin pquentin merged commit 720598c into main Sep 26, 2025
16 checks passed
@pquentin pquentin deleted the fix-branch-validation branch September 26, 2025 09:35
Copy link
Contributor

The backport to 8.19 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.19 8.19
# Navigate to the new working tree
cd .worktrees/backport-8.19
# Create a new branch
git switch --create backport-5344-to-8.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 720598cf7541ae19da7e33cbfdaa006caf7cee18
# Push it to GitHub
git push --set-upstream origin backport-5344-to-8.19
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.19

Then, create a pull request where the base branch is 8.19 and the compare/head branch is backport-5344-to-8.19.

Copy link
Contributor

The backport to 8.18 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-8.18 8.18
# Navigate to the new working tree
cd .worktrees/backport-8.18
# Create a new branch
git switch --create backport-5344-to-8.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 720598cf7541ae19da7e33cbfdaa006caf7cee18
# Push it to GitHub
git push --set-upstream origin backport-5344-to-8.18
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-8.18

Then, create a pull request where the base branch is 8.18 and the compare/head branch is backport-5344-to-8.18.

Copy link
Contributor

The backport to 9.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-9.0 9.0
# Navigate to the new working tree
cd .worktrees/backport-9.0
# Create a new branch
git switch --create backport-5344-to-9.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 720598cf7541ae19da7e33cbfdaa006caf7cee18
# Push it to GitHub
git push --set-upstream origin backport-5344-to-9.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.0

Then, create a pull request where the base branch is 9.0 and the compare/head branch is backport-5344-to-9.0.

github-actions bot pushed a commit that referenced this pull request Sep 26, 2025
pquentin added a commit that referenced this pull request Sep 26, 2025
pquentin added a commit that referenced this pull request Sep 26, 2025
pquentin added a commit that referenced this pull request Sep 26, 2025
@pquentin
Copy link
Member Author

💚 All backports created successfully

Status Branch Result
9.0
8.19
8.18

Questions ?

Please refer to the Backport tool documentation

pquentin added a commit that referenced this pull request Sep 26, 2025
pquentin added a commit that referenced this pull request Sep 26, 2025
(cherry picked from commit 720598c)

Co-authored-by: Quentin Pradet <quentin.pradet@elastic.co>
pquentin added a commit that referenced this pull request Sep 26, 2025
pquentin added a commit that referenced this pull request Sep 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants