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

Update backport CI, add PR merged condition #1952

Merged
merged 1 commit into from
Aug 10, 2023
Merged

Conversation

ps48
Copy link
Member

@ps48 ps48 commented Aug 10, 2023

Description

Update backport CI, add PR merged condition

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

@codecov
Copy link

codecov bot commented Aug 10, 2023

Codecov Report

Merging #1952 (1b3b808) into main (91bbb5d) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1952   +/-   ##
=========================================
  Coverage     97.51%   97.51%           
  Complexity     4657     4657           
=========================================
  Files           408      408           
  Lines         11931    11931           
  Branches        830      830           
=========================================
  Hits          11634    11634           
  Misses          290      290           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.51% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@ps48 ps48 merged commit a3d2fae into opensearch-project:main Aug 10, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-1952-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a3d2fae47f091298cbd37e30ce149b26ebd74aa6
# Push it to GitHub
git push --set-upstream origin backport/backport-1952-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

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

MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
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