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.14] Remove strict version dependency to compile minimum compatible version #2485 #3123

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

pyek-bot
Copy link
Contributor

@pyek-bot pyek-bot commented Oct 17, 2024

Requirement:

  • Need to handle BWC for rag processor in 2.13 and want to use this version rather than older version to prevent conflicts

  • Remove unnecessary dependency

  • remove space


(cherry picked from commit 954e8b3)

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.

…ompatible version (opensearch-project#2486) (opensearch-project#2523)

* [Feature/multi_tenancy] Remove strict version dependency to compile minimum compatible version (opensearch-project#2485)

* Remove strict version dependency to compile minimum compatible version

Signed-off-by: Daniel Widdis <[email protected]>

* Only declare version constants once

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>

* Remove unnecessary dependency

Signed-off-by: Sicheng Song <[email protected]>

* remove space

Signed-off-by: Sicheng Song <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: Sicheng Song <[email protected]>
Co-authored-by: Daniel Widdis <[email protected]>
(cherry picked from commit 954e8b3)

Co-authored-by: Sicheng Song <[email protected]>
@pyek-bot
Copy link
Contributor Author

Please add 2.13 backport label

@pyek-bot
Copy link
Contributor Author

Please re-run tests. Failing due to flaky tests.

@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env October 31, 2024 12:04 — with GitHub Actions Failure
@dhrubo-os dhrubo-os merged commit 50cdb3f into opensearch-project:2.14 Dec 30, 2024
7 of 13 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

pyek-bot added a commit to pyek-bot/ml-commons that referenced this pull request Dec 31, 2024
…ompatible version (opensearch-project#2486) (opensearch-project#2523) (opensearch-project#3123)

* [Feature/multi_tenancy] Remove strict version dependency to compile minimum compatible version (opensearch-project#2485)

* Remove strict version dependency to compile minimum compatible version

* Only declare version constants once

---------

* Remove unnecessary dependency

* remove space

---------

(cherry picked from commit 954e8b3)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Sicheng Song <[email protected]>
pyek-bot added a commit to pyek-bot/ml-commons that referenced this pull request Jan 3, 2025
…ompatible version (opensearch-project#2486) (opensearch-project#2523) (opensearch-project#3123)

* [Feature/multi_tenancy] Remove strict version dependency to compile minimum compatible version (opensearch-project#2485)

* Remove strict version dependency to compile minimum compatible version

* Only declare version constants once

---------

* Remove unnecessary dependency

* remove space

---------

(cherry picked from commit 954e8b3)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Sicheng Song <[email protected]>
Signed-off-by: Pavan Yekbote <[email protected]>
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.

4 participants