diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5fb549d97e88e9e66ae71f60a452c23b05c7d76..f23c257b489b5017bede09b4862b0f74e18b55f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,26 +3,21 @@ image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_dev:testing stages: - build - test - - container - deploy .eicweb: rules: - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' - tags: - - silicon -.not-eicweb: +.documentation: rules: - - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov"' + - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"' compile: extends: .eicweb stage: build script: - bash bin/do_build - rules: - - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov" && $CI_PIPELINE_SOURCE == "merge_request_event"' artifacts: when: always paths: @@ -40,34 +35,13 @@ test_npsim: - LD_LIBRARY_PATH=install/lib:$LD_LIBRARY_PATH install/bin/npsim --compactFile examples/gem_tracker_disc.xml --enableGun --numberOfEvents 10 --outputFile test_files/test_npsim.root - rootls -t test_files/test_npsim.root artifacts: - expire_in: 3 days + expire_in: 1 days paths: - test_files/ -docker_image: - image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest - stage: container - extends: .eicweb - rules: - - if: '$CI_COMMIT_BRANCH == "master" && $CI_SERVER_HOST == "eicweb.phy.anl.gov"' - script: - - echo "CI_SERVER_HOST is $CI_SERVER_HOST" - - cd .containers/docker && make release - -docker_tag: - image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest - stage: container - extends: .eicweb - rules: - - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG' - script: - - cd .containers/docker && make release - - gen_doxygen_src: - stage: container - rules: - - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"' + stage: build + extends: .documentation script: - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install artifacts: @@ -76,11 +50,10 @@ gen_doxygen_src: - build/src/dd4pod/dd4pod rtd_sphinx_build: - stage: container + stage: build + extends: .documentation #image: eicweb.phy.anl.gov:4567/containers/eic_container/rtd_builder image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest - rules: - - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"' script: - apt-get update && apt-get install -y python3-sphinx python3-pip - pip3 install sphinx && pip3 install sphinx_rtd_theme @@ -90,12 +63,10 @@ rtd_sphinx_build: - docs/_build/html pages: - image: eicweb.phy.anl.gov:4567/containers/eic_container/alpine stage: deploy - extends: .not-eicweb + extends: .documentation + image: eicweb.phy.anl.gov:4567/containers/eic_container/alpine needs: ['gen_doxygen_src','rtd_sphinx_build'] - rules: - - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"' script: - apk update && apk add doxygen graphviz ttf-ubuntu-font-family - mkdir -p public && cp -r docs/_build/html/* public/.