Skip to content

Workflow Guide

Kevin Do edited this page Sep 30, 2018 · 1 revision

Here is a brief write up of our workflow process.

High Level

  1. Create a branch off of DEV

dev -> dev-kdo-someComponent

  1. Work on your feature/fix/test task
import React, {Component} from 'react';

class SomeComponent extends Component {
...
  1. Write tests and make sure they pass
  2. Update your branch if it has updated since your initial branch

Merge dev -into-> dev-kdo-someComponent

  1. Fix any conflicts that arise, it is your responsibility to resolve merge conflicts!
yarn test
  1. Dev and Master are protected branches, you must create a PR and assign people on the team
  2. Use the PR Template
  3. Feel free to label your PR as well
  4. Changes will be approved and if all goes well, the TravisCI integration checks pass and the branch will be merged

Deployment Process

  1. Master and Dev are protected branches
  2. Merges from Dev into Master are considered releases
  3. Updates to Master trigger an automated TravisCI build and test
  4. If the build and tests are successful, deployment is activated onto our live domain

Clone this wiki locally