From 5ba749ddd1c0af9c36f4c31869d62c83c9ed2416 Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Fri, 24 Apr 2020 14:19:52 +0300 Subject: [PATCH] Only set GMX_PYTHON_PACKAGE=ON where needed. Remove GMX_PYTHON_PACKAGE=ON from default CMAKE_GMXAPI_OPTIONS. Only provide it in the jobs supporting documentation builds (which use a gmxapi Python package staged in the build tree). Remove a "TODO" that is confusing and presumably outdated. --- admin/gitlab-ci/documentation.gitlab-ci.yml | 2 ++ admin/gitlab-ci/global.gitlab-ci.yml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/gitlab-ci/documentation.gitlab-ci.yml b/admin/gitlab-ci/documentation.gitlab-ci.yml index 5061edd4a3..2a2e5bf369 100644 --- a/admin/gitlab-ci/documentation.gitlab-ci.yml +++ b/admin/gitlab-ci/documentation.gitlab-ci.yml @@ -20,6 +20,7 @@ CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=OFF" CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=Debug" CMAKE_GPU_OPTIONS: "-DGMX_GPU=OFF" + CMAKE_GMXAPI_OPTIONS: "-DGMX_PYTHON_PACKAGE=ON" script: - if [[ ! -z $GROMACS_RELEASE && $GROMACS_RELEASE == "true" ]] ; then REL_OPTION="-DGMX_BUILD_TARBALL=ON" ; @@ -86,6 +87,7 @@ CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=OFF" CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=Debug" CMAKE_GPU_OPTIONS: "-DGMX_GPU=OFF" + CMAKE_GMXAPI_OPTIONS: "-DGMX_PYTHON_PACKAGE=ON" RELEASE_BUILD_DIR: release-doc-builds RELEASE_SOURCE: release-source-from-tarball RELEASE_REGRESSIONTESTS: release-regressiontests-from-tarball diff --git a/admin/gitlab-ci/global.gitlab-ci.yml b/admin/gitlab-ci/global.gitlab-ci.yml index e86f75bd57..ef488a3c6a 100644 --- a/admin/gitlab-ci/global.gitlab-ci.yml +++ b/admin/gitlab-ci/global.gitlab-ci.yml @@ -12,8 +12,7 @@ CACHE_FALLBACK_KEY: "$CI_JOB_NAME-$CI_JOB_STAGE-master" BUILD_DIR: build INSTALL_DIR: install - CMAKE_GMXAPI_OPTIONS: "-DGMX_PYTHON_PACKAGE=ON" -# TODO: Get these from updated Docker images. + CMAKE_GMXAPI_OPTIONS: "" # Our generic before_script to install dependencies and prepare the ccache directory. .before_script:default: -- 2.22.0