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

Changing the BWC version to 2.8.0 #446

Merged
merged 2 commits into from
May 18, 2023
Merged

Conversation

khushbr
Copy link
Collaborator

@khushbr khushbr commented May 17, 2023

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Changing the BWC version to 2.8.0, made the corresponding change in 2.x to publish the 2.8.0 Snapshots, available at https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/gradle/build-tools/

Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

Additional context
Add any other context or screenshots about the feature request here.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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: Khushboo Rajput <[email protected]>
@codecov
Copy link

codecov bot commented May 17, 2023

Codecov Report

Merging #446 (52a5c16) into main (9524c08) will not change coverage.
The diff coverage is n/a.

❗ Current head 52a5c16 differs from pull request most recent head dec858a. Consider uploading reports for the commit dec858a to get more accurate results

@@            Coverage Diff            @@
##               main     #446   +/-   ##
=========================================
  Coverage     72.13%   72.13%           
  Complexity      375      375           
=========================================
  Files            44       44           
  Lines          2591     2591           
  Branches        173      173           
=========================================
  Hits           1869     1869           
  Misses          614      614           
  Partials        108      108           

@khushbr khushbr merged commit 92ab90b into opensearch-project:main May 18, 2023
@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-446-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 92ab90bb0a622b6c188b76ed379687bdf9f2217b
# Push it to GitHub
git push --set-upstream origin backport/backport-446-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-446-to-2.x.

ansjcy pushed a commit that referenced this pull request May 31, 2023
* Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

* nit: Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

---------

Signed-off-by: Khushboo Rajput <[email protected]>
(cherry picked from commit 92ab90b)
@opensearch-trigger-bot
Copy link
Contributor

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

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

ansjcy pushed a commit that referenced this pull request May 31, 2023
* Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

* nit: Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

---------

Signed-off-by: Khushboo Rajput <[email protected]>
(cherry picked from commit 92ab90b)
@khushbr khushbr deleted the bwc-fix branch May 31, 2023 17:58
khushbr added a commit that referenced this pull request Jun 28, 2023
* Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

* nit: Changing the BWC version to 2.8.0

Signed-off-by: Khushboo Rajput <[email protected]>

---------

Signed-off-by: Khushboo Rajput <[email protected]>
(cherry picked from commit 92ab90b)

Co-authored-by: Khushboo Rajput <[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.

3 participants