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

More updates to the OSB build #635

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

gkamat
Copy link
Collaborator

@gkamat gkamat commented Sep 9, 2024

Description

Follow-on to commit 6f0ae23.

Testing

Ran unit and integ tests, verified GitHub actions run through successfully.


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.

@gkamat gkamat force-pushed the bld-fixes-update branch 3 times, most recently from 09508c8 to 94eee53 Compare September 12, 2024 00:53
Signed-off-by: Govind Kamat <govkamat@amazon.com>
@IanHoang IanHoang merged commit 9d79747 into opensearch-project:main Sep 13, 2024
12 checks passed
@opensearch-trigger-bot
Copy link

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

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

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