Successfully reported this slideshow.
Your SlideShare is downloading. ×

Introduction to GitHub workflow, Sep. 2016, ESRF

Ad

svn@SF2git@GitHub
Migration
GitHub workflow

Ad

07/10/16 Igor Khokhriakov 2
GitHub workflow. Simple
● Fork
● Git clone
● Git checkout -b feature
● Do stuff
● Git push
● C...

Ad

07/10/16 Igor Khokhriakov 3
GitHub workflow. Concurrent
● Git pull –rebase upstream master
● Git push -f
GitHub workflow. ...

Ad

Ad

Ad

Ad

Ad

Ad

Ad

Loading in …3
×

Check these out next

1 of 10 Ad
1 of 10 Ad
Advertisement

More Related Content

Advertisement

Introduction to GitHub workflow, Sep. 2016, ESRF

  1. 1. svn@SF2git@GitHub Migration GitHub workflow
  2. 2. 07/10/16 Igor Khokhriakov 2 GitHub workflow. Simple ● Fork ● Git clone ● Git checkout -b feature ● Do stuff ● Git push ● Create a Pull Request
  3. 3. 07/10/16 Igor Khokhriakov 3 GitHub workflow. Concurrent ● Git pull –rebase upstream master ● Git push -f GitHub workflow. Close PR ● Maintainer approval + Tests passed ● Delete branch (git branch -d feature) ● Sync fork master with upstream master (git checkout master; git pull upstream master)
  4. 4. 07/10/16 Igor Khokhriakov 4 gitk
  5. 5. 07/10/16 Igor Khokhriakov 5 https://www.atlassian.com/git/tutorials/
  6. 6. 07/10/16 Igor Khokhriakov 6 svn@SF2git@GitHub Migration Continuous Integration Setup Status
  7. 7. 07/10/16 Igor Khokhriakov 7 Environment Independent Tests ● Based on docker containers: – MySQL + TANGO DB – TANGO CS (from Michał Liszcz aka mliszcz) – make start-tango; make tests ; make stop-tango ● For gurus: set up the whole environment – make – ctest -R runner -V ctest runs conf_devtest and starts DevTest and FwdTest
  8. 8. 07/10/16 Igor Khokhriakov 8 Travis
  9. 9. 07/10/16 Igor Khokhriakov 9 svn@SF2git@GitHub Migration TODOs
  10. 10. 07/10/16 Igor Khokhriakov 10 TODOs ● Fix tests ● CMake targets for tests ● CMake port to Windows ● CI on Windows (Appveyor or windows container for travis) ● Extract docker images for travis into a dedicated repos ● Tweak ctest to test memory leaks, coverage etc

Editor's Notes

  • Make tests wraps ctest -V call in run.sh (sets TANGO_HOST)
    Think of docker container as a rich process (process with environment encapsulated)
    One can run individual tests with ctest
  • Tarvis setup uses docker containers
    Runs debian 8&7 RELEASE + debian 8 DEBUG

×