Skip to content
Snippets Groups Projects
Commit 631e4802 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'pages' into 'master'

Fixed up pages

See merge request !7

	modified:   .gitlab-ci.yml
parents 990949d1 e3efe546
Branches
Tags
1 merge request!8Pages
...@@ -9,16 +9,34 @@ stages: ...@@ -9,16 +9,34 @@ stages:
# tags: # tags:
# - sodium # - sodium
# script: # script:
# - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install && make -j20 && make install # - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install && make -j10 && make install
# artifacts:
# paths:
# - build/doxygen_output
gen_doxygen_src:
stage: build
rules:
- if: '$CI_SERVER_HOST == "gitlab.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
script:
- mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install
artifacts:
paths:
- build/src
- build/eicd
pages: pages:
image: alpine
stage: deploy stage: deploy
needs: ['gen_doxygen_src']
rules:
- if: '$CI_SERVER_HOST == "gitlab.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
script: script:
- mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install && make doc_doxygen && cd .. - apk update && apk add doxygen graphviz ttf-ubuntu-font-family
- cp -r build/doxygen_output/html public - cd build && mkdir -p doxygen_output && doxygen ../docs/Doxyfile && cd ..
- mkdir -p public && cp -r doxygen_output/html/* public/.
# - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install && make doc_doxygen && cd ..
#- cp -r build/doxygen_output/html public
artifacts: artifacts:
paths: paths:
- public - public
only:
- master
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment