Development workflow - webdev

This page describes the development model used by the web development team at WormBase using git as our version control system. This includes our branching strategy and release management.

Diagram

Editable version of the diagram

Branch Strategy

We use branches to help with our release management, testing strategy, and helping with parallel development among the team.

Main branches

Inside the WormBase/website repository, there are three main branches: master, dev and production.

• master: current, stable code. All new changes brought into master have been tested on staging.wormbase.org and approved by either the curator requesting the change, or the development lead.

• dev: any features/changes ready for testing should be pushed to the dev branch. This code gets pushed nightly to staging.wormbase.org.

• production: the code currently in production. Branched off of master at each release.

Supporting branches

Other types of branches used can include feature branches and hotfixes. These branches are only intended to live until the new feature is merged into dev or the fix is completed.

Feature branches

Any new major features should branch off dev. Once the feature is ready for testing, it can be merged back into dev.

Starting a feature branch

> git checkout -b myFeature dev

Pushing a feature onto dev

When you're ready to incorporate your feature and have it tested on staging.wormbase.org, you can push your feature branch back to dev

Hotfixes

If a major bugfix is needed in production, create a hotfix branch from production. When finished, the branch needs to be merged back into production and dev

Links

• staging site for testing
• github repository
• github issue tracker
• workflow diagram