diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3322dd02054662afe4ddd678f467f192d43eaa3e..96e825ab685b8dc27a50edbc7340af5eeffaef1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,19 @@ # CI pipeline configuration + +# Switch from branch pipelines to merge request pipelines when a merge request is created +workflow: + rules: + # Ensures next rules do not block triggered pipelines + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" + when: never + # always run for merge requests + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + # never run a branch pipeline if there is an open merge request for that branch + - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS + when: never + # the only allowed branch pipeline is that on the default branch + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + stages: - build - run @@ -66,4 +81,24 @@ testing_stage: allow_failure: true needs: - job: running_stage - \ No newline at end of file + artifacts: + - paths: + - build/cluster/pycompare.html + - build/sphere/pycompare.html + exclude: + - ".git*" + - ".git/**/*" + expire_in: 2 hours + script: + # bash commands to be executed + - pwd + - hostname + - echo $CI_COMMIT_SHA + - echo $CI_COMMIT_BRANCH + - cd build/sphere + - echo "Comparing output of SPHERE" + - python3 ../../src/scripts/pycompare.py --ffile=OSPH --cfile=c_OSPH --html + - cd ../cluster + - echo "Comparing output of CLUSTER" + - python3 ../../src/scripts/pycompare.py --ffile=OCLU --cfile=c_OCLU --html +