Skip to content

Improve behaviour of check_modified_files

Spyros Argyropoulos requested to merge improvemodfiles into master

Changes introduced

  • Do a git pull origin master before checking for modified files

Tests

Check that the pipeline passes for branches that don't contain conflicting changes

https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/-/jobs/9506303 Screenshot_2020-08-03_at_14.30.28

Check that the pipeline fails if something which was already in master has been modified

https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/-/jobs/9517314 Screenshot_2020-08-04_at_10.19.18

Check what happens when there are conflicts

https://gitlab.cern.ch/atlas-physics/pmg/mcjoboptions/-/jobs/9517705 Screenshot_2020-08-04_at_10.51.13

Issues resolved

Closes #113 (closed)

Edited by Spyros Argyropoulos

Merge request reports