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

[Release 3.0] Bump main branch to use revision 3.0.0.0-alpha1 #61

Merged
merged 2 commits into from
Jan 30, 2025

Conversation

peterzhuamazon
Copy link
Member

@peterzhuamazon peterzhuamazon commented Jan 28, 2025

Description

[Release 3.0] Bump main branch to use revision 3.0.0.0-alpha1

Issues Resolved

#55

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@peterzhuamazon
Copy link
Member Author

Weird, the failure did not show on my local.

Signed-off-by: Peter Zhu <[email protected]>
@peterzhuamazon
Copy link
Member Author

peterzhuamazon commented Jan 28, 2025

The eclipse issue is more or less related to the incident here:

https://www.eclipsestatus.io/incident/502896?mp=true

I kept re-running on my local and 3 out of 10 times it will have this connectivity issues.

@peterzhuamazon
Copy link
Member Author

All test passed after eclipse repo is stable now.

Hi @dbwiddis @dhrubo-os @arjunkumargiri please take a look when you have time.

Thanks!

@peterzhuamazon peterzhuamazon changed the title Bump main branch to use revision 3.0.0-alpha1 Bump main branch to use revision 3.0.00-alpha1 Jan 30, 2025
@peterzhuamazon peterzhuamazon changed the title Bump main branch to use revision 3.0.00-alpha1 Bump main branch to use revision 3.0.0.0-alpha1 Jan 30, 2025
@peterzhuamazon peterzhuamazon changed the title Bump main branch to use revision 3.0.0.0-alpha1 [Release 3.0] Bump main branch to use revision 3.0.0.0-alpha1 Jan 30, 2025
@dbwiddis dbwiddis merged commit 4ff695f into opensearch-project:main Jan 30, 2025
10 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@dhrubo-os
Copy link
Contributor

This shouldn't be merged in 2.x branch I think?

@peterzhuamazon
Copy link
Member Author

We should not merge this to 2.x.

@peterzhuamazon peterzhuamazon deleted the bump-3.0-alpha1 branch January 30, 2025 21:16
@peterzhuamazon
Copy link
Member Author

Not sure why there is a bot doing the backport label adding.

This was referenced Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

3 participants