From f4d4889cab33d9942a75b6037e777c610e70cf87 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 27 Jan 2021 00:38:36 -0600
Subject: [PATCH] Fixed up pages
---
.gitlab-ci.yml | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90b13ed..13fafea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,16 +9,34 @@ stages:
# tags:
# - sodium
# 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:
+ image: alpine
stage: deploy
+ needs: ['gen_doxygen']
+ rules:
+ - if: '$CI_SERVER_HOST == "gitlab.phy.anl.gov" && $CI_COMMIT_BRANCH == "master"'
script:
- - mkdir build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=../install && make doc_doxygen && cd ..
- - cp -r build/doxygen_output/html public
+ - apk update && apk add doxygen graphviz ttf-ubuntu-font-family
+ - 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:
paths:
- public
- only:
- - master
--
GitLab