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.

Sign up for GitHub

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

Jump to bottom

Adapt release script to push release branch and create PR #1995

Closed
abrokenjester opened this issue Mar 12, 2020 · 3 comments · Fixed by #1997 or #2000
Closed

Adapt release script to push release branch and create PR #1995

abrokenjester opened this issue Mar 12, 2020 · 3 comments · Fixed by #1997 or #2000
Assignees
@abrokenjester
Labels
🔧 internal task a project workflow / setup task not directly impacting end users

Comments

@abrokenjester
Copy link
Contributor

The current release process (and the release script) create a local release branch, but do not push this branch upstream - instead it only pushes the tag. It then pushes a commit directly on master branch to update pom versions after the release has been tagged.

To improve visibility of changes and stability of the master branch, I want to get to a state where we never have to push commits directly to master (instead always using PRs to merge/rebase). This means that the release process needs to be modified a little as well.

Proposed improvement:

  1. release branch is pushed upstream
  2. after version tag has been created and pushed, pom versions get set for the next iteration on the release branch
  3. script creates a pull request (using hub) to merge the release branch back into master.
@abrokenjester abrokenjester self-assigned this Mar 12, 2020
@abrokenjester abrokenjester added the 🔧 internal task a project workflow / setup task not directly impacting end users label Mar 12, 2020
@abrokenjester
Copy link
Contributor Author

Difficulty: this approach makes creating a merge branch to bring develop into sync more difficult.

@abrokenjester
Copy link
Contributor Author

Got a solution. Gonna try this out for the 3.1.2 release. If I stuff it up I can easily adjust.

abrokenjester added a commit that referenced this issue Mar 12, 2020
@abrokenjester
GH-1995 push release branch and automate PR creation
199fad0 
- 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 abrokenjester mentioned this issue Mar 12, 2020
Merged
abrokenjester added a commit that referenced this issue Mar 12, 2020
@abrokenjester
GH-1995 push release branch and automate PR creation
ad52009 
- 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 added a commit that referenced this issue Mar 12, 2020
@abrokenjester
GH-1995 fix in release script pushing tag
133c75a
abrokenjester added a commit that referenced this issue Mar 13, 2020
@abrokenjester
GH-1995 fix hub command
892d482 
Also adjusted text for Jenkins deployment
@abrokenjester abrokenjester reopened this Mar 13, 2020
@abrokenjester
Copy link
Contributor Author

Needs a few minor adjustments.

abrokenjester added a commit that referenced this issue Mar 13, 2020
@abrokenjester
GH-1995 target develop branch for sync PR
382cdd4 
- added PR body message reminding to use merge commit
@abrokenjester abrokenjester mentioned this issue Mar 13, 2020
Merged
abrokenjester added a commit that referenced this issue Mar 13, 2020
@abrokenjester
GH-1995 target develop branch for sync PR
ebd0aa8 
- added PR body message reminding to use merge commit
abrokenjester added a commit that referenced this issue Mar 13, 2020
@abrokenjester
GH-1995 target develop branch for sync PR
40cf0f0 
- added PR body message reminding to use merge commit
@abrokenjester abrokenjester mentioned this issue Mar 14, 2020
Closed
@abrokenjester abrokenjester mentioned this issue Apr 1, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@abrokenjester abrokenjester

Labels
🔧 internal task a project workflow / setup task not directly impacting end users
Projects
None yet
Milestone
No milestone
1 participant
@abrokenjester