Skip to main content

Hot-fixing/updating Calvera

note

This document is about creating a hot-fix, if you want to make a new release, please refer to another document

We can use standard git flow process for that. We don't have Release branches, so this part is irrelevant.

so

  1. Start a new branch from main repo(s). There can be one or several repos involved. 
git checkout main
git checkout -b hotfix_branch

  1. Make your changes. These changes can already be in the dev branch, so one can cherry-pick from there or just recreate what is needed. Unless you are adding/modifying a Galaxy tool, or it's destination, bump config version (yes, this will require hot-fixing calvera repo as well, even if it was not touched during other changes)

  2. Merge changes into both main and dev branches (via a Merge Request). If the changes were already in the dev branch (and they actually should be, because we test first on calvera-test, don't we? :)), one can skip merging with dev.