Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport main] 2.17.1 Release Notes #886

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport f4f0cfc from #884.

Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit f4f0cfc)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link

codecov bot commented Sep 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.55%. Comparing base (22c994b) to head (1a887bf).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main     #886   +/-   ##
=========================================
  Coverage     77.55%   77.55%           
  Complexity      966      966           
=========================================
  Files            97       97           
  Lines          4531     4531           
  Branches        422      422           
=========================================
  Hits           3514     3514           
  Misses          835      835           
  Partials        182      182           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@owaiskazi19 owaiskazi19 merged commit beacf08 into main Sep 30, 2024
22 of 23 checks passed
@owaiskazi19 owaiskazi19 deleted the backport/backport-884-to-main branch September 30, 2024 17:19
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-886-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 beacf0899abd52c8a9d1e18086cf03c7863acbbf
# Push it to GitHub
git push --set-upstream origin backport/backport-886-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-886-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants