Skip to content

Commit 706dc4b

Browse files
authored
Merge pull request #2367 from DARMA-tasking/2364-fix-documentation-build
#2364: fix documentation build
2 parents a6bad05 + 98595cc commit 706dc4b

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.github/workflows/build-docs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
env:
1515
REPO: lifflander1/vt
1616
ARCH: amd64
17-
UBUNTU: 18.04
17+
UBUNTU: 22.04
1818
COMPILER_TYPE: gnu
19-
COMPILER: gcc-8
20-
HOST_COMPILER: gcc-8
19+
COMPILER: gcc-11
20+
HOST_COMPILER: gcc-11
2121
BUILD_TYPE: release
2222
ULIMIT_CORE: 0
2323
VT_LB: 1

ci/build_cpp.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ then
184184
git clone "https://${token}@github.com/DARMA-tasking/DARMA-tasking.github.io"
185185
git clone https://github.com/mosra/m.css
186186
cd m.css
187-
git checkout master
187+
git checkout 699abdd5
188+
sed -i '2600d' documentation/doxygen.py # remove incorrect assertion
188189
cd ../
189190

190191
"$MCSS/documentation/doxygen.py" Doxyfile-mcss

ci/docker/ubuntu-gnu-docs.dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG arch=amd64
2-
FROM ${arch}/ubuntu:18.04 as base
2+
ARG ubuntu=22.04
3+
FROM ${arch}/ubuntu:${ubuntu} as base
34

45
ARG proxy=""
56
ARG compiler=gcc-8

0 commit comments

Comments
 (0)