Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Development cheat sheet

Riccardo De Maria edited this page Jul 16, 2018 · 17 revisions

Setting up (to do once)

  • Install git

  • Sign-up GitHub account

  • Set ssh keys

  • Fork SixTrack repository

  • Set upstream repository

      # Set upstream repository
      git remote add upstream [email protected]:SixTrack/SixTrack.git
    

For each development

  • Update origin/master from upstream

      # Update origin/master from upstream
      git fetch upstream
      git checkout master
      git merge upstream/master
      git push
    
  • Create local branch (named e.g. "fix_bug") and add it to origin

      git checkout -b "fix_bug"
      git push --set-upstream origin "fix_bug"
    
  • Commit changes and/or merge from upstream

      git checkout "fix_bug"
      git merge master
      < make modifications >
      git add ...
      git commit ...
    
  • Push commits to origin

      git push
    
  • Create pull request from the website and wait until is merged

  • Delete feature branch

      git branch -d "fix_bug"
      git push origin --delete "fix_bug"
    

Contribute to someone else's pull request

The recipient (e.g. kyrsjo ) has to allow maintainers to push in the pull request

   git remote add kyrsjo [email protected]:kyrsjo/SixTrack.git
   git fetch kyrsjo
   git checkout kyrsjo/BEAMBEAM-EXP
   git checkout -b BEAMBEAM-EXP
   git push --set-upstream kyrsjo BEAMBEAM-EXP

Perform tests

Make sure you are in SixTrack directory

  ./cmake_six BUILD_TESTING
  cd build/*BUILD_TESTING* #see last line
  ctest --print-labels # see available labels
  ctest -L fast #execute fast tests
  ctest -N #see available tests
  ctest -R "beam-HO.*" # run test starting with name "beam-HO" 
Clone this wiki locally