When all tests done and successful and PR is approved, follow these steps:
-
Select "Squash and merge" to merge branch into default branch (master/main).
-
A prompt for writing merge commit message will pop up.
-
Find the title of the pull request already pre-filled in the merge commit title, or copy and paste the title if not.
-
Append version increment value
( major | minor | patch )
to specify what kind of release is to be created. -
Fill in markdown formatted changelog in merge commit comment details:
### Added
### Changed
### Fixed
-
Review the details once again and merge the branch into master.
-
Wait for GitHub actions to process the event, bump version, create release, publish to Dockerhub and PyPi where applicable.
-
Deploy on the appropriate server:
- Deploy on hasta:
- Deploy master to stage
ssh hasta
us
- Request stage environment
paxa
and follow instructions -
bash /home/proj/production/servers/resources/hasta.scilifelab.se/update-tool-stage.sh -e S_trailblazer -t trailblazer -b master -a
- Make sure that installation was successful
down
- Deploy master to production
- Ensure the publish action to PyPi is finished.
up
-
bash /home/proj/production/servers/resources/hasta.scilifelab.se/update-tool-prod.sh -e P_trailblazer -t trailblazer -b master -a
- Make sure that installation was successful
- Deploy master to stage
- Deploy on hasta:
-
Take a screenshot and post as a comment on the PR. Screenshot should include environment and that it succeeded