diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed16394ed..dd20c8baa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,9 +77,9 @@ variables: IntelMarc: "$IntelCompiler17_8" HDF5Marc: "HDF5/1.10.5/Intel-17.8" # ++++++++++++ Documentation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Doxygen1_8_15: "Documentation/Doxygen/1.8.15" + Doxygen1_8_17: "Documentation/Doxygen/1.8.17" # ------------ Defaults ---------------------------------------------- - Doxygen: "$Doxygen1_8_15" + Doxygen: "$Doxygen1_8_17" ################################################################################################### @@ -490,7 +490,7 @@ GridSolver: stage: createDocumentation script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT spectral + - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT grid except: - master - release diff --git a/PRIVATE b/PRIVATE index d0d5b5a22..b84d2cf61 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit d0d5b5a22be9778187b100214c782747793bb956 +Subproject commit b84d2cf61b28d4a7a4568c5eca53d30aa34bee6a