Loading .gitlab-ci.yml +36 −36 Original line number Diff line number Diff line # CI pipeline configuration default: image: gcc image: gmulas/np-tmcode # Switch from branch pipelines to merge request pipelines when a merge request is created workflow: Loading @@ -25,15 +25,15 @@ stages: building_stage: stage: build allow_failure: false #artifacts: # paths: # - build/cluster/* # - build/sphere/* # - build/trapping/* # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/* - build/sphere/* - build/trapping/* exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -42,22 +42,22 @@ building_stage: - echo $CI_COMMIT_BRANCH - cd src - echo "Running make (ONLY C++ CODE)" #- make conly - make running_stage: stage: run allow_failure: false needs: - job: building_stage #artifacts: # paths: # - build/cluster/* # - build/sphere/* # - build/trapping/* # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/* - build/sphere/* - build/trapping/* exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -66,26 +66,26 @@ running_stage: - echo $CI_COMMIT_BRANCH - cd build/sphere - echo "Running np_sphere" #- chmod +x np_sphere #- ./np_sphere - chmod +x np_sphere - ./np_sphere - cd ../cluster - echo "Running np_cluster" #- chmod +x np_cluster #- ./np_cluster - chmod +x np_cluster - ./np_cluster testing_stage: stage: test allow_failure: true needs: - job: running_stage #artifacts: # paths: # - build/cluster/pycompare.html # - build/sphere/pycompare.html # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/pycompare.html - build/sphere/pycompare.html exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -93,11 +93,11 @@ testing_stage: - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - cd build/sphere #- cp ../../test_data/sphere/OSPH . - export FFILE=../../test_data/sphere/OSPH - echo "Comparing output of SPHERE" #- python3 ../../src/scripts/pycompare.py --ffile=OSPH --cfile=c_OSPH --html - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OSPH --html - cd ../cluster - echo "Comparing output of CLUSTER" #- cp ../../test_data/cluster/OCLU . #- python3 ../../src/scripts/pycompare.py --ffile=OCLU --cfile=c_OCLU --html - export FFILE=../../test_data/cluster/OCLU - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html Loading
.gitlab-ci.yml +36 −36 Original line number Diff line number Diff line # CI pipeline configuration default: image: gcc image: gmulas/np-tmcode # Switch from branch pipelines to merge request pipelines when a merge request is created workflow: Loading @@ -25,15 +25,15 @@ stages: building_stage: stage: build allow_failure: false #artifacts: # paths: # - build/cluster/* # - build/sphere/* # - build/trapping/* # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/* - build/sphere/* - build/trapping/* exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -42,22 +42,22 @@ building_stage: - echo $CI_COMMIT_BRANCH - cd src - echo "Running make (ONLY C++ CODE)" #- make conly - make running_stage: stage: run allow_failure: false needs: - job: building_stage #artifacts: # paths: # - build/cluster/* # - build/sphere/* # - build/trapping/* # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/* - build/sphere/* - build/trapping/* exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -66,26 +66,26 @@ running_stage: - echo $CI_COMMIT_BRANCH - cd build/sphere - echo "Running np_sphere" #- chmod +x np_sphere #- ./np_sphere - chmod +x np_sphere - ./np_sphere - cd ../cluster - echo "Running np_cluster" #- chmod +x np_cluster #- ./np_cluster - chmod +x np_cluster - ./np_cluster testing_stage: stage: test allow_failure: true needs: - job: running_stage #artifacts: # paths: # - build/cluster/pycompare.html # - build/sphere/pycompare.html # exclude: # - ".git*" # - ".git/**/*" # expire_in: 2 hours artifacts: paths: - build/cluster/pycompare.html - build/sphere/pycompare.html exclude: - ".git*" - ".git/**/*" expire_in: 2 hours script: # bash commands to be executed - pwd Loading @@ -93,11 +93,11 @@ testing_stage: - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - cd build/sphere #- cp ../../test_data/sphere/OSPH . - export FFILE=../../test_data/sphere/OSPH - echo "Comparing output of SPHERE" #- python3 ../../src/scripts/pycompare.py --ffile=OSPH --cfile=c_OSPH --html - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OSPH --html - cd ../cluster - echo "Comparing output of CLUSTER" #- cp ../../test_data/cluster/OCLU . #- python3 ../../src/scripts/pycompare.py --ffile=OCLU --cfile=c_OCLU --html - export FFILE=../../test_data/cluster/OCLU - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html