Skip to content

Session 3 guide

Selin Jessa edited this page May 3, 2020 · 14 revisions

Code working group - Session 3

Agenda

  • 30 min: questions, troubleshooting, and fixing the repo
  • 5 min: recap
  • 10 min: intro to continuous integration, look around examples at the package cytobox
  • Flip the switch and turn on Travis builds!
  • 5 min: intro PRs, PRs vs merge
  • 5 min: introduce the next task
  • 5 min: demo pull request for one issue branch onto develop-private, and follow the status check

Task:

  1. Get the latest changes on the develop-private branch:
    • Go to the branch, git checkout develop-private and run git pull
    • Go back on your issue branch, git checkout issue/XXX and rebase: git rebase develop-private

🛑 At this step, you should verify that on your branch, you see a file called .travis.yml. This needs to exist on the branch for Travis to run status checks on it.

  1. Push the change of history to GitHub: git push -f origin issueXXX
  2. Now you'll want to watch the Travis status check
    • If the build passes, with a green checkmark, then there were no errors or warnings, and you can go to the next step
    • If the build fails: look through the build report, and fix the issues on your issue branch
      • From your branch, you'll need to modify the appropriate files, add, commit, and push to trigger a new build
      • Repeat this until the build passes, let us know if you need help debugging!
  3. Congrats, your build passed! Open a pull request to merge issue/XXX into develop-private

Clone this wiki locally