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 2.7] Update 2.x changelog and create 2.7.0 release notes #3888

Merged
merged 1 commit into from
Apr 19, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 0ff894b from #3875.

* Chore: bump version to 2.7.0
* update 2.6.0 section from release notes, remove duplicates
* clean up changelog, copy to 2.7.0 release notes

Signed-off-by: Josh Romero <[email protected]>

---------

Signed-off-by: Josh Romero <[email protected]>
(cherry picked from commit 0ff894b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team as a code owner April 19, 2023 17:02
@manasvinibs manasvinibs added the autocut Skip the changelog verification check on backports label Apr 19, 2023
@joshuarrrr joshuarrrr merged commit 51f091d into 2.7 Apr 19, 2023
@github-actions github-actions bot deleted the backport/backport-3875-to-2.7 branch April 19, 2023 18:54
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.7 failed:

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

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-2.7 2.7
# Navigate to the new working tree
pushd ../.worktrees/backport-2.7
# Create a new branch
git switch --create backport/backport-3888-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 51f091d56532b3283fc2e09f78fe79a7ce745ac9
# Push it to GitHub
git push --set-upstream origin backport/backport-3888-to-2.7
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.7

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autocut Skip the changelog verification check on backports v2.7.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants