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

GH-1995 push release branch and automate PR creation #1997

Merged
merged 1 commit into from
Mar 12, 2020

Conversation

abrokenjester
Copy link
Contributor

  • push release branch to avoid direct commits on master
  • use hub command to create PR for release branch to master
  • use hub command to create PR for updating develop branch

GitHub issue resolved: #1995

- push release branch to avoid direct commits on master
- use hub command to create PR for release branch to master
- use hub command to create PR for updating develop branch
@abrokenjester
Copy link
Contributor Author

abrokenjester commented Mar 12, 2020

I will merge this immediately so I can use it for the 3.1.2 release. Only way to really debug, unfortunately, is to actually use it for a release. @hmottestad still interested in your review though.

@abrokenjester abrokenjester merged commit ad52009 into master Mar 12, 2020
@abrokenjester abrokenjester deleted the GH-1995-release-branch-handling branch March 12, 2020 23:43
@hmottestad
Copy link
Contributor

For testing i have previously forked the RDF4J repo.

@@ -153,7 +165,7 @@ git pull

MVN_VERSION_DEVELOP=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)

git checkout master
git checkout ${BRANCH}

Copy link
Contributor

Choose a reason for hiding this comment

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

Isn’t this the branch we are on already?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, good point

echo "The release script requires several external command line tools:"
echo " - git"
echo " - mvn"
echo " - hub (https://hub.github.com/)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use the official command line client instead? https://cli.github.com/

Copy link
Contributor

Choose a reason for hiding this comment

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

Or is the benefit of using hub that we don’t have to log in again?

Copy link
Contributor

Choose a reason for hiding this comment

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

Btw. We need to test that hub (or whatever we end up with) works as an early step in the script. So it doesn’t crash half way through.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wasn't aware there was another client, I thought hub is the official client. Happy to consider alternatives if they're better.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or is the benefit of using hub that we don’t have to log in again?

No and actually that brings up a point: you need to set this tool up first before it works.

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.

Adapt release script to push release branch and create PR
2 participants