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

[AUTO] Increment version to 2.15.0-SNAPSHOT #730

Merged
merged 1 commit into from
May 20, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

  • Incremented version to 2.15.0-SNAPSHOT.

@jmazanec15
Copy link
Member

BWC tests are failing with missing knn and ml-commons dependencies. Both k-NN and ml-commons are failing:

 * What went wrong:
A problem occurred evaluating root project 'neural-search'.
> Could not resolve all files for configuration ':zipArchive'.
   > Could not find org.opensearch.plugin:opensearch-knn:2.15.0.0-SNAPSHOT.
     Searched in the following locations:

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
@martin-gaievski martin-gaievski force-pushed the create-pull-request/2.15.0-SNAPSHOT branch from d48b355 to 36c7dc3 Compare May 20, 2024 16:35
@martin-gaievski
Copy link
Member

Dependency repos knn and ml-commons got upgraded 2.x to 2.15, adding bwc related changes and resuming efforts for upgrade

@martin-gaievski martin-gaievski merged commit 398a465 into 2.x May 20, 2024
88 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to main failed:

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

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

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

martin-gaievski pushed a commit to martin-gaievski/neural-search that referenced this pull request May 21, 2024
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
(cherry picked from commit 398a465)
martin-gaievski added a commit that referenced this pull request May 21, 2024
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
(cherry picked from commit 398a465)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
VijayanB pushed a commit that referenced this pull request May 29, 2024
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
(cherry picked from commit 398a465)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
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.

3 participants