diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c7fd950af5819a90f59996bc64c80803980840a..aa2c22accc080ff3fc4027c44cf4df5390156b88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -42,76 +42,79 @@ building_stage: - echo $CI_COMMIT_BRANCH - echo "Getting system info ..." - cat /etc/os-release - #- echo "Updating system" - #- apt update + - echo "Updating system" + - yum check-update + - yum update - echo "Installing dependencies" - #- apt install -y g++ gfortran make + - yum install -y g++ gfortran make - cd src - echo "Running make" - #- make + - 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 - hostname - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - #- echo "Updating system" - #- apt update + - echo "Updating system" + - yum check-update + - yum update - echo "Installing dependencies" - #- apt install -y g++ gfortran gdb - #- cd build/sphere - #- echo "Running np_sphere" - #- chmod +x np_sphere - #- ./np_sphere - #- cd ../cluster + - yum install -y g++ gfortran gdb + - cd build/sphere + - echo "Running 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 - hostname - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - #- echo "Updating system" - #- apt update - #- echo "Installing dependencies ..." - #- apt install -y python3 - #- cd build/sphere + - echo "Updating system" + - yum check-update + - yum update + - echo "Installing dependencies ..." + - apt install -y python3 + - cd build/sphere - export FFILE=../../test_data/sphere/OSPH - echo "Comparing output of SPHERE" - #- python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OSPH --html + - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OSPH --html - cd ../cluster - echo "Comparing output of CLUSTER" - export FFILE=../../test_data/cluster/OCLU - #- python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html + - python3 ../../src/scripts/pycompare.py --ffile=$FFILE --cfile=c_OCLU --html