Version |
---|
1.10-SNAPSHOT |
Repository containing files to test Github Actions and add/edit .yaml
files for seeing how actions will perform before adding them to other git repos.
- Develop Branch Merge Verification
- PR Title matches branch name
- PR Branch matches regexp?
- Auto Merge PR on Comment
- Needed to install Bulldozer Github App: https://github.com/apps/prylabs-bulldozer
- Release Cutting
- Following https://nvie.com/posts/a-successful-git-branching-model/
release-*
branches off ofdevelop
release-*
branches merge tomain
- I think we DONT want to
squash and merge
here, so that the history stays intact - Create Github PR
- Create New Github Milestone?
- Release Merging
- add git tag (vX.X.X) to
main
on merge - upmerge
develop
frommain
on merge tomain
- add git tag (vX.X.X) to
- Hotfix Branch creation
- Main Branch Merge Verification
- must be from
hotfix-
orrelease-
branch - must have PR title with
hotfix-
orrelease
- must be from
- Test Major Release Cut
- [..] Generate Changelog
- Either:
- in release cut, but whatabout hotfixes?
- in merge to main, but this will trigger infinite loop with PAT
- need to enable/disable branch protections if we don't want to use this
- Hotfix Branch Merge Verification
- no
feat
orfeature
commits
- no
- Resolve Conflicts Better in upmerge
main
->develop
after release
Personal Access Token - some of these steps require a secret PAT
that is a Github Token from an Admin user account
- Update version files after release cut
- Upmerge develop after release merge