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

feat: creating branch from tagged branch #598

Closed
wants to merge 2 commits into from

Conversation

germa89
Copy link
Contributor

@germa89 germa89 commented Oct 3, 2024

As the title.

Close #597

@germa89 germa89 requested a review from a team as a code owner October 3, 2024 17:51
@ansys-reviewer-bot
Copy link
Contributor

Thanks for opening a Pull Request. If you want to perform a review write a comment saying:

@ansys-reviewer-bot review

@github-actions github-actions bot added the enhancement General improvements to existing features label Oct 3, 2024
@germa89 germa89 requested a review from klmcadams October 3, 2024 18:00
@@ -262,7 +262,7 @@ runs:
if [ $count -gt 0 ]; then
echo "Using ${{ env.UPDATE_BRANCH }} to update the CHANGELOG file"
if [[ ${{ env.RELEASE_BRANCH_EXISTS }} == "false" ]]; then
git checkout -b ${{ env.UPDATE_BRANCH }}
git checkout -b ${{ env.UPDATE_BRANCH }} ${{ env.MAIN_BRANCH }}
Copy link
Contributor

@klmcadams klmcadams Oct 3, 2024

Choose a reason for hiding this comment

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

I think we should keep it as git checkout -b ${{ env.UPDATE_BRANCH }} because the temporary branch, maint/changelog-update-v${{ env.TAG_VERSION }}, is only created if the release branch or main do not exist. Otherwise, if the release branch or main do exist, then UPDATE_BRANCH is set to the release branch or main & the changelog file is updated directly on either of those branches

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it... Check 864c905

@germa89 germa89 enabled auto-merge (squash) October 4, 2024 10:21
@@ -262,7 +262,7 @@ runs:
if [ $count -gt 0 ]; then
echo "Using ${{ env.UPDATE_BRANCH }} to update the CHANGELOG file"
if [[ ${{ env.RELEASE_BRANCH_EXISTS }} == "false" ]]; then
git checkout -b ${{ env.UPDATE_BRANCH }}
git checkout -b ${{ env.UPDATE_BRANCH }} ${{ env.UPDATE_BRANCH }}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
git checkout -b ${{ env.UPDATE_BRANCH }} ${{ env.UPDATE_BRANCH }}
git checkout -b ${{ env.UPDATE_BRANCH }}

I think we do not need to duplicate it... right?

@klmcadams
Copy link
Contributor

Closing this since there would be no changes

@klmcadams klmcadams closed this Oct 7, 2024
auto-merge was automatically disabled October 7, 2024 14:33

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement General improvements to existing features
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong checkout branch in the changelog action?
3 participants