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.x] Update release notes for 2.13 #6213

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 1f74ab3 from #6209.

Signed-off-by: Manasvini B Suryanarayana <manasvis@amazon.com>
(cherry picked from commit 1f74ab3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot added autocut Skip the changelog verification check on backports Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry labels Mar 19, 2024
@kavilla kavilla merged commit 2955e4a into 2.x Apr 8, 2024
26 of 27 checks passed
@github-actions github-actions bot deleted the backport/backport-6209-to-2.x branch April 8, 2024 22:52
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

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 backport 2.13 failed backport Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.13.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants