search

opensearch-project / neural-search

Plugin that adds dense neural retrieval into the OpenSearch ecosytem
Apache License 2.0
57 stars 58 forks source link

Update bwc workflow to include 2.14.0-SNAPSHOT #673

Closed vibrantvarun closed 3 months ago

vibrantvarun commented 3 months ago

Description

Update bwc workflow to include 2.14.0-SNAPSHOT in

  1. .github/workflows/backwards_compatibility_tests_workflow.yml
  2. gradle.properties

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.

martin-gaievski commented 3 months ago

Do we need to merge https://github.com/opensearch-project/neural-search/pull/653 along with this PR?

navneet1v commented 3 months ago

@vibrantvarun can you check k-NN plugin, we have automated this step. Let do that too. Its okay to do manual changes for now

ref: https://github.com/opensearch-project/k-NN/blob/main/build.gradle#L439-L465

vibrantvarun commented 3 months ago

Alright I will raise PR to automate this. For this PR let's go with the manual way.

opensearch-trigger-bot[bot] commented 3 months ago

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

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