Skip to content

ci: move docs dependencies to Rocky image #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joshua-white wants to merge 2 commits into from
+9 −9
Closed

ci: move docs dependencies to Rocky image #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0af460
ci: move docs dependencies to Rocky image
joshua-white Sep 15, 2026
c934a70
ci: align documentation Doxygen version
joshua-white Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker_build_tpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/ubuntu-spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions scripts/reproduce_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion scripts/spack_packages/packages/geosx/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

#
Expand Down