From 2742e9e7fd0efb2695a7ce64ca9ffa4956b748e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Tue, 29 Oct 2024 20:39:41 +0100 Subject: [PATCH 1/2] #2364: use Ubuntu 22.04 in documentation build --- .github/workflows/build-docs.yml | 6 +++--- ci/docker/ubuntu-gnu-docs.dockerfile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 7a73fd7950..a1e9ded590 100644 --- 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/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile index 09038c97ff..15fcde0a88 100644 --- 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 From 98595cc2fdaace8fc5456fc8112673e267741f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Tue, 29 Oct 2024 21:30:02 +0100 Subject: [PATCH 2/2] #2364: disable incorrect assertion in m.css --- ci/build_cpp.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index d494b195f5..1d7531882f 100755 --- 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