Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.
svn@SF2git@GitHub
Migration
GitHub workflow
07/10/16 Igor Khokhriakov 2
GitHub workflow. Simple
● Fork
● Git clone
● Git checkout -b feature
● Do stuff
● Git push
● C...
07/10/16 Igor Khokhriakov 3
GitHub workflow. Concurrent
● Git pull –rebase upstream master
● Git push -f
GitHub workflow. ...
07/10/16 Igor Khokhriakov 4
gitk
07/10/16 Igor Khokhriakov 5
https://www.atlassian.com/git/tutorials/
07/10/16 Igor Khokhriakov 6
svn@SF2git@GitHub
Migration
Continuous Integration Setup
Status
07/10/16 Igor Khokhriakov 7
Environment Independent Tests
● Based on docker containers:
– MySQL + TANGO DB
– TANGO CS (fro...
07/10/16 Igor Khokhriakov 8
Travis
07/10/16 Igor Khokhriakov 9
svn@SF2git@GitHub
Migration
TODOs
07/10/16 Igor Khokhriakov 10
TODOs
● Fix tests
● CMake targets for tests
● CMake port to Windows
● CI on Windows (Appveyor...
Upcoming SlideShare
Loading in …5
×

Introduction to GitHub workflow, Sep. 2016, ESRF

21 views

Published on

Git; GitHub workflow; Environment independent tests; Status report

Published in: Software
  • Be the first to comment

  • Be the first to like this

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

×