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

Upgrade BWC version to 2.19 #980

Merged
merged 1 commit into from
Nov 11, 2024

Conversation

martin-gaievski
Copy link
Member

Description

Bump one version up for BWC tests workflow after 2.18 got released and next 2.x has updated to 2.19.
For 2.x it will be a separate PR as these changes cannot be backported "as is".

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

Signed-off-by: Martin Gaievski <[email protected]>
@martin-gaievski martin-gaievski added backport 2.x Label will add auto workflow to backport PR to 2.x branch Maintenance Add support for new versions of OpenSearch/Dashboards from upstream skip-changelog labels Nov 8, 2024
@martin-gaievski martin-gaievski changed the title Added 2.19 as next OS version Upgrade BWC version to 2.19 Nov 8, 2024
Copy link
Member

@yuye-aws yuye-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@vibrantvarun vibrantvarun merged commit 0119907 into opensearch-project:main Nov 11, 2024
59 of 60 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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-980-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 011990700bc26bf19a67c5ec06699032c1c5636f
# Push it to GitHub
git push --set-upstream origin backport/backport-980-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-980-to-2.x.

martin-gaievski added a commit that referenced this pull request Nov 11, 2024
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 0119907)
martin-gaievski added a commit that referenced this pull request Nov 11, 2024
Signed-off-by: Martin Gaievski <[email protected]>
(cherry picked from commit 0119907)
Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit that referenced this pull request Nov 11, 2024
(cherry picked from commit 0119907)

Signed-off-by: Martin Gaievski <[email protected]>
martin-gaievski added a commit that referenced this pull request Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Label will add auto workflow to backport PR to 2.x branch Maintenance Add support for new versions of OpenSearch/Dashboards from upstream skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants