From af3281de58a082beb1d4a7552471f11d01b4e937 Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Tue, 15 Jun 2021 16:46:41 +0200 Subject: [PATCH] Use 20.04 for docs build Updated image with new tex font package needed for 20.04 --- admin/containers/scripted_gmx_docker_builds.py | 3 ++- admin/gitlab-ci/documentation.gitlab-ci.yml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin/containers/scripted_gmx_docker_builds.py b/admin/containers/scripted_gmx_docker_builds.py index 7f120509dd..3ed8cb7020 100755 --- a/admin/containers/scripted_gmx_docker_builds.py +++ b/admin/containers/scripted_gmx_docker_builds.py @@ -173,7 +173,8 @@ _docs_extra_packages = ['autoconf', 'texlive-latex-base', 'texlive-latex-extra', 'texlive-fonts-recommended', - 'texlive-fonts-extra'] + 'texlive-fonts-extra', + 'tex-gyre'] # Parse command line arguments parser = argparse.ArgumentParser(description='GROMACS CI image creation script', diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml index b15f6c7e80..e0df386b4a 100644 --- a/admin/gitlab-ci/documentation.gitlab-ci.yml +++ b/admin/gitlab-ci/documentation.gitlab-ci.yml @@ -6,7 +6,7 @@ - .gromacs:base:configure - .before_script:default # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-7-docs stage: configure-build cache: {} variables: @@ -77,7 +77,7 @@ - .before_script:default - .rules:nightly-only-for-release # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-7-docs stage: release-configure cache: {} variables: @@ -188,7 +188,7 @@ docs:configure: .docs:build: # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-7-docs script: - cd $BUILD_DIR - cmake --build . --target gmx -- -j8 @@ -228,7 +228,7 @@ docs:build: - .gromacs:base:build - .before_script:default # TODO (#3480) this should be organized more like the current documentation.py script - image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-7-docs + image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-7-docs cache: {} variables: KUBERNETES_CPU_LIMIT: 4 -- 2.22.0