Commit df9bad4d authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Update CI

parent d788e1eb
Pipeline #19984 passed with stages
in 2 minutes and 45 seconds
...@@ -3,26 +3,21 @@ image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_dev:testing ...@@ -3,26 +3,21 @@ image: eicweb.phy.anl.gov:4567/containers/eic_container/jug_dev:testing
stages: stages:
- build - build
- test - test
- container
- deploy - deploy
.eicweb: .eicweb:
rules: rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
tags:
- silicon
.not-eicweb: .documentation:
rules: rules:
- if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov"' - if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
compile: compile:
extends: .eicweb extends: .eicweb
stage: build stage: build
script: script:
- bash bin/do_build - bash bin/do_build
rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov" && $CI_PIPELINE_SOURCE == "merge_request_event"'
artifacts: artifacts:
when: always when: always
paths: paths:
...@@ -40,34 +35,13 @@ test_npsim: ...@@ -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 - 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 - rootls -t test_files/test_npsim.root
artifacts: artifacts:
expire_in: 3 days expire_in: 1 days
paths: paths:
- test_files/ - 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: gen_doxygen_src:
stage: container stage: build
rules: extends: .documentation
- if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
script: script:
- mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install
artifacts: artifacts:
...@@ -76,11 +50,10 @@ gen_doxygen_src: ...@@ -76,11 +50,10 @@ gen_doxygen_src:
- build/src/dd4pod/dd4pod - build/src/dd4pod/dd4pod
rtd_sphinx_build: 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/eic_container/rtd_builder
image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest 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: script:
- apt-get update && apt-get install -y python3-sphinx python3-pip - apt-get update && apt-get install -y python3-sphinx python3-pip
- pip3 install sphinx && pip3 install sphinx_rtd_theme - pip3 install sphinx && pip3 install sphinx_rtd_theme
...@@ -90,12 +63,10 @@ rtd_sphinx_build: ...@@ -90,12 +63,10 @@ rtd_sphinx_build:
- docs/_build/html - docs/_build/html
pages: pages:
image: eicweb.phy.anl.gov:4567/containers/eic_container/alpine
stage: deploy stage: deploy
extends: .not-eicweb extends: .documentation
image: eicweb.phy.anl.gov:4567/containers/eic_container/alpine
needs: ['gen_doxygen_src','rtd_sphinx_build'] needs: ['gen_doxygen_src','rtd_sphinx_build']
rules:
- if: '$CI_SERVER_HOST != "eicweb.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
script: script:
- apk update && apk add doxygen graphviz ttf-ubuntu-font-family - apk update && apk add doxygen graphviz ttf-ubuntu-font-family
- mkdir -p public && cp -r docs/_build/html/* public/. - mkdir -p public && cp -r docs/_build/html/* public/.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment