Skip to content

Support checkout out #.x branch types#1179

Merged
peternied merged 1 commit intoopensearch-project:mainfrom
peternied:support-x-branch
Nov 2, 2022
Merged

Support checkout out #.x branch types#1179
peternied merged 1 commit intoopensearch-project:mainfrom
peternied:support-x-branch

Conversation

@peternied
Copy link
Member

Description

Support checkout out #.x branch types

This change was included in change #1167 that was merged into 2.x

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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: Peter Nied <petern@amazon.com>
@peternied peternied requested a review from a team November 1, 2022 21:59
@codecov-commenter
Copy link

Codecov Report

Merging #1179 (353674d) into main (eee08a5) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1179   +/-   ##
=======================================
  Coverage   71.82%   71.82%           
=======================================
  Files          88       88           
  Lines        2023     2023           
  Branches      268      268           
=======================================
  Hits         1453     1453           
  Misses        508      508           
  Partials       62       62           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@DarshitChanpura DarshitChanpura left a comment

Choose a reason for hiding this comment

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

LGTM! Added one quick comment.

continue-on-error: true # Defaults onto main if the branch switch doesn't work
if: ${{ steps.osd-version.outputs.osd-version }}
run: git checkout ${{ steps.osd-version.outputs.osd-version }} -b v${{ steps.osd-version.outputs.osd-version }}
run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
Copy link
Member

Choose a reason for hiding this comment

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

I like the idea of not creating new branch vX.y every-time this step runs. Qq, this change is expected corrected?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, I did this on purpose, didn't seem to be much purpose to creating a new branch when we just want to checkout and build.

@peternied peternied merged commit d46e60a into opensearch-project:main Nov 2, 2022
@peternied peternied deleted the support-x-branch branch November 2, 2022 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants