Doxygen is now generated by gitlab and done on each master merge

This commit is contained in:
Robert Maynard 2020-05-29 16:00:17 -04:00
parent a652f7fe1e
commit 71d9d4311e
4 changed files with 85 additions and 5 deletions

@ -38,6 +38,11 @@
# - tbb # - tbb
# - openmp # - openmp
# - mpich2 # - mpich2
# * .gitlab/ci/docker/ubuntu2004/doxygen/
# - gcc 9.3
# - tbb
# - openmp
# - mpich2
.docker_image: &docker_image .docker_image: &docker_image
variables: variables:
@ -78,6 +83,12 @@
extends: extends:
- .docker_image - .docker_image
.ubuntu2004_doxygen: &ubuntu2004_doxygen
image: "kitware/vtkm:ci-doxygen-20200601"
extends:
- .docker_image
.only-default: &only-default .only-default: &only-default
only: only:
- master - master
@ -88,12 +99,9 @@
only: only:
- master - master
# General Longer Term Tasks: # General Longer Term Tasks:
# - setup asan, and ubsan as sub-pipeline # - Setup clang tidy as sub-pipeline
# - setup clang tidy as sub-pipeline
#
# Current Tasks:
# - Determine if we can get sccache to work with CUDA
# - Setup a machine to replicate the issue in https://gitlab.kitware.com/vtk/vtk-m/-/issues/447 # - Setup a machine to replicate the issue in https://gitlab.kitware.com/vtk/vtk-m/-/issues/447
# Note: Centos7 doesn't work as they ship separate standard library # Note: Centos7 doesn't work as they ship separate standard library
# headers for each version. We will have to figure out something else # headers for each version. We will have to figure out something else
@ -165,6 +173,7 @@ stages:
include: include:
- local: '/.gitlab/ci/centos7.yml' - local: '/.gitlab/ci/centos7.yml'
- local: '/.gitlab/ci/centos8.yml' - local: '/.gitlab/ci/centos8.yml'
- local: '/.gitlab/ci/doxygen.yml'
- local: '/.gitlab/ci/rhel8.yml' - local: '/.gitlab/ci/rhel8.yml'
- local: '/.gitlab/ci/ubuntu1604.yml' - local: '/.gitlab/ci/ubuntu1604.yml'
- local: '/.gitlab/ci/ubuntu1804.yml' - local: '/.gitlab/ci/ubuntu1804.yml'

@ -0,0 +1,33 @@
FROM ubuntu:20.04
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
cmake \
curl \
doxygen \
g++ \
git \
git-lfs \
libmpich-dev \
libomp-dev \
libtbb-dev \
mpich \
ninja-build \
rsync \
ssh \
software-properties-common
# Need to run git-lfs install manually on ubuntu based images when using the
# system packaged version
RUN git-lfs install
# Provide CMake 3.17 so we can re-run tests easily
# This will be used when we run just the tests
RUN mkdir /opt/cmake/ && \
curl -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh > cmake-3.17.3-Linux-x86_64.sh && \
sh cmake-3.17.3-Linux-x86_64.sh --prefix=/opt/cmake/ --exclude-subdir --skip-license && \
rm cmake-3.17.3-Linux-x86_64.sh && \
ln -s /opt/cmake/bin/ctest /opt/cmake/bin/ctest-latest
ENV PATH "${PATH}:/opt/cmake/bin"

@ -34,6 +34,10 @@ cd ubuntu1804/cuda10.1
sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda10.1-$date . sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda10.1-$date .
cd ../.. cd ../..
cd ubuntu2004/doxygen/
sudo docker build -t kitware/vtkm:ci-doxygen-$date .
cd ../..
# sudo docker login --username=<docker_hub_name> # sudo docker login --username=<docker_hub_name>
sudo docker push kitware/vtkm sudo docker push kitware/vtkm
sudo docker system prune sudo docker system prune

34
.gitlab/ci/doxygen.yml Normal file

@ -0,0 +1,34 @@
# Build on documentation for VTK-m on ubuntu2004 with TBB and OpenMP
# Uses gcc 9
# Uses MPICH2
doxygen:
stage: build
environment:
#establish that we need doxygen related
#env variables
name: doxygen-upload
only:
#make sure we are only trigged on
#the vtk-m primary project
variables:
- '$DOXYGEN_UPLOAD_ENABLE == "true"'
timeout: 30 minutes
interruptible: true
tags:
- vtkm
- docker
- linux
extends:
- .ubuntu2004_doxygen
before_script:
- "cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake"
- "ctest -VV -S .gitlab/ci/ctest_configure.cmake"
script:
- eval `ssh-agent -s`
- ssh-add <(echo "$DOC_API_KEY_BASE64" | base64 --decode)
- doxygen build/docs/doxyfile
- rsync -tv --recursive --delete -e "ssh -o StrictHostKeyChecking=no" build/docs/doxygen/html/ vtkm.documentation
variables:
CMAKE_BUILD_TYPE: Release
VTKM_SETTINGS: "tbb+openmp+mpi+shared+docs"