Merge pull request #2367 from DARMA-tasking/2364-fix-documentation-build

#2364: fix documentation build
DARMA-tasking · Nov 6, 2024 · 706dc4b · 706dc4b
2 parents a6bad05 + 98595cc
commit 706dc4b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -14,10 +14,10 @@ jobs:
     env:
       REPO: lifflander1/vt
       ARCH: amd64
-      UBUNTU: 18.04
+      UBUNTU: 22.04
       COMPILER_TYPE: gnu
-      COMPILER: gcc-8
-      HOST_COMPILER: gcc-8
+      COMPILER: gcc-11
+      HOST_COMPILER: gcc-11
       BUILD_TYPE: release
       ULIMIT_CORE: 0
       VT_LB: 1

diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -184,7 +184,8 @@ then
     git clone "https://${token}@github.com/DARMA-tasking/DARMA-tasking.github.io"
     git clone https://github.com/mosra/m.css
     cd m.css
-    git checkout master
+    git checkout 699abdd5
+    sed -i '2600d' documentation/doxygen.py # remove incorrect assertion
     cd ../
 
     "$MCSS/documentation/doxygen.py" Doxyfile-mcss

diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile
@@ -1,5 +1,6 @@
 ARG arch=amd64
-FROM ${arch}/ubuntu:18.04 as base
+ARG ubuntu=22.04
+FROM ${arch}/ubuntu:${ubuntu} as base
 
 ARG proxy=""
 ARG compiler=gcc-8