From d0af460813a93bc0c7b39434cd3e33fadd2c2161 Mon Sep 17 00:00:00 2001 From: Joshua White Date: Tue, 15 Sep 2026 14:32:14 -0700 Subject: [PATCH 1/2] ci: move docs dependencies to Rocky image --- .github/workflows/docker_build_tpls.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_build_tpls.yml b/.github/workflows/docker_build_tpls.yml index c5abfea8..6654c2dc 100644 --- a/.github/workflows/docker_build_tpls.yml +++ b/.github/workflows/docker_build_tpls.yml @@ -33,14 +33,14 @@ jobs: GCC_VERSION: 12 SPEC: "~pygeosx ~docs %gcc-12" - - name: Ubuntu 24.04 - gcc 13 (docs) + - name: Ubuntu 24.04 - gcc 13 RUNS_ON: ubuntu-latest TPL_DOCKERFILE: docker/tpl-ubuntu.Dockerfile DOCKER_BASE_IMAGE_TAG: 24.04-gcc13 DOCKER_BASE_IMAGE_REPO: geosx/ubuntu DOCKER_REPOSITORY: geosx/ubuntu24.04-gcc13 GCC_VERSION: 13 - SPEC: "~pygeosx +docs %gcc-13" + SPEC: "~pygeosx ~docs %gcc-13" - name: Ubuntu 24.04 - clang 19 RUNS_ON: ubuntu-latest @@ -69,13 +69,13 @@ jobs: DOCKER_REPOSITORY: geosx/rockylinux8-gcc12 SPEC: "~pygeosx ~docs %gcc-12" - - name: Rocky Linux 8 - gcc 13 + - name: Rocky Linux 8 - gcc 13 (docs) RUNS_ON: ubuntu-latest TPL_DOCKERFILE: docker/tpl-rockylinux.Dockerfile DOCKER_BASE_IMAGE_TAG: 8-gcc13 DOCKER_BASE_IMAGE_REPO: geosx/rockylinux DOCKER_REPOSITORY: geosx/rockylinux8-gcc13 - SPEC: "~pygeosx ~docs %gcc-13" + SPEC: "~pygeosx +docs %gcc-13" - name: Rocky Linux 8 - clang 19 RUNS_ON: ubuntu-latest From c934a708d6f9b0a1e248a6c502fd7973ee7716f4 Mon Sep 17 00:00:00 2001 From: Joshua White Date: Wed, 16 Sep 2026 18:53:22 -0700 Subject: [PATCH 2/2] ci: align documentation Doxygen version --- docker/ubuntu-spack.yaml | 4 ++-- scripts/reproduce_ci.sh | 4 ++-- scripts/spack_packages/packages/geosx/package.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/ubuntu-spack.yaml b/docker/ubuntu-spack.yaml index 40915d04..3a2f79e8 100644 --- a/docker/ubuntu-spack.yaml +++ b/docker/ubuntu-spack.yaml @@ -181,8 +181,8 @@ spack: doxygen: buildable: false externals: - - spec: doxygen@1.8.20 - prefix: /usr + - spec: doxygen@1.13.2 + prefix: /usr/local autoconf: version: [2.71] diff --git a/scripts/reproduce_ci.sh b/scripts/reproduce_ci.sh index 3e9f2771..7ad32024 100755 --- a/scripts/reproduce_ci.sh +++ b/scripts/reproduce_ci.sh @@ -15,11 +15,11 @@ cd -- "${repo_root}" # extra_env space-separated KEY=VALUE pairs passed to scripts/docker-build.sh. MATRIX=( 'Ubuntu 24.04 - gcc 12|docker/tpl-ubuntu.Dockerfile|24.04-gcc12|geosx/ubuntu|geosx/ubuntu24.04-gcc12|12||~pygeosx ~docs %gcc-12' -'Ubuntu 24.04 - gcc 13 (docs)|docker/tpl-ubuntu.Dockerfile|24.04-gcc13|geosx/ubuntu|geosx/ubuntu24.04-gcc13|13||~pygeosx +docs %gcc-13' +'Ubuntu 24.04 - gcc 13|docker/tpl-ubuntu.Dockerfile|24.04-gcc13|geosx/ubuntu|geosx/ubuntu24.04-gcc13|13||~pygeosx ~docs %gcc-13' 'Ubuntu 24.04 - clang 19|docker/tpl-ubuntu.Dockerfile|24.04-clang19|geosx/ubuntu|geosx/ubuntu24.04-clang19||19|~pygeosx ~docs %clang-19' 'Ubuntu 24.04 - clang 20|docker/tpl-ubuntu.Dockerfile|24.04-clang20|geosx/ubuntu|geosx/ubuntu24.04-clang20||20|~pygeosx ~docs %clang-20' 'Rocky Linux 8 - gcc 12|docker/tpl-rockylinux.Dockerfile|8-gcc12|geosx/rockylinux|geosx/rockylinux8-gcc12|||~pygeosx ~docs %gcc-12' -'Rocky Linux 8 - gcc 13|docker/tpl-rockylinux.Dockerfile|8-gcc13|geosx/rockylinux|geosx/rockylinux8-gcc13|||~pygeosx ~docs %gcc-13' +'Rocky Linux 8 - gcc 13 (docs)|docker/tpl-rockylinux.Dockerfile|8-gcc13|geosx/rockylinux|geosx/rockylinux8-gcc13|||~pygeosx +docs %gcc-13' 'Rocky Linux 8 - clang 19|docker/tpl-rockylinux.Dockerfile|8-clang19|geosx/rockylinux|geosx/rockylinux8-clang19|||~pygeosx ~docs %clang-19' 'Rocky Linux 9 - clang 22|docker/tpl-rockylinux.Dockerfile|9-clang22|geosx/rockylinux|geosx/rockylinux9-clang22|||~pygeosx ~docs %clang-22' 'Ubuntu 24.04 - gcc 13 + CUDA 12.9.1|docker/tpl-ubuntu.Dockerfile|24.04-gcc13-cuda12.9.1|geosx/ubuntu|geosx/ubuntu24.04-gcc13-cuda12.9.1|13||+cuda cuda_arch=86,120 ~openmp ~pygeosx ~docs %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers' diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 533c7b63..c0659ec2 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -219,7 +219,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): # # Documentation # - depends_on('doxygen@1.8.20', when='+docs', type='build') + depends_on('doxygen@1.13.2', when='+docs', type='build') depends_on('py-sphinx@1.6.3:', when='+docs', type='build') #