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

Fix backport branch name is not correct #69

Merged
merged 1 commit into from
Dec 27, 2023

Conversation

Hailong-am
Copy link
Contributor

@Hailong-am Hailong-am commented Dec 27, 2023

Description

The correct backport branch name should be something like backport/backport-41-to-2.x
otherwise, backport branch will not get deleted when merged by delete_backport_branch workflow

Issues Resolved

An example of wrong backportn name PR #68

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.

Copy link

codecov bot commented Dec 27, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3774eb9) 81.76% compared to head (5e77515) 81.76%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main      #69   +/-   ##
=========================================
  Coverage     81.76%   81.76%           
  Complexity       86       86           
=========================================
  Files             8        8           
  Lines           521      521           
  Branches         70       70           
=========================================
  Hits            426      426           
  Misses           54       54           
  Partials         41       41           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zane-neo
Copy link
Collaborator

Backport is failing, do we need to handle this failure?

@Hailong-am
Copy link
Contributor Author

Hailong-am commented Dec 27, 2023

Backport is failing, do we need to handle this failure?

line 39 will handle this. line12-21 will disable backport workflow run when creating a normal PR.

@zhichao-aws zhichao-aws merged commit 05c8fe0 into opensearch-project:main Dec 27, 2023
14 of 16 checks passed
@Hailong-am Hailong-am mentioned this pull request Dec 27, 2023
5 tasks
opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 27, 2023
Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 05c8fe0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
zhichao-aws added a commit that referenced this pull request Dec 27, 2023
* Fix backport branch name is not correct (#69)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 05c8fe0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* include fix in #70

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: zhichao-aws <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
yuye-aws pushed a commit to yuye-aws/skills that referenced this pull request Apr 26, 2024
…oject#71)

* Fix backport branch name is not correct (opensearch-project#69)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 05c8fe0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* include fix in opensearch-project#70

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: zhichao-aws <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
Signed-off-by: yuye-aws <[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