From 8cef73c4debdbc00e429535ec72d49d6c0babdac Mon Sep 17 00:00:00 2001 From: "M. Eric Irrgang" Date: Tue, 17 Mar 2020 17:33:38 +0300 Subject: [PATCH] Document CI variable and remove unused template. Change-Id: I03a3790fa962b508afc797728a94ebaccfb2509b --- admin/ci-templates/.build-mpi-template.yml | 3 --- admin/ci-templates/.include-template.yml | 1 - docs/dev-manual/gitlab.rst | 11 ++++------- 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 admin/ci-templates/.build-mpi-template.yml diff --git a/admin/ci-templates/.build-mpi-template.yml b/admin/ci-templates/.build-mpi-template.yml deleted file mode 100644 index 0010deb6a4..0000000000 --- a/admin/ci-templates/.build-mpi-template.yml +++ /dev/null @@ -1,3 +0,0 @@ -.build-mpi-template: - variables: - CMAKE_MPI_OPTIONS: "-DGMX_MPI=ON" diff --git a/admin/ci-templates/.include-template.yml b/admin/ci-templates/.include-template.yml index 1027664ed1..c3dc219ad2 100644 --- a/admin/ci-templates/.include-template.yml +++ b/admin/ci-templates/.include-template.yml @@ -16,7 +16,6 @@ include: - local: '/admin/ci-templates/.test-script-template.yml' - local: '/admin/ci-templates/.build-docs-template.yml' - local: '/admin/ci-templates/.cuda-template.yml' - - local: '/admin/ci-templates/.build-mpi-template.yml' - local: '/admin/ci-templates/.build-gmxapi-template.yml' - local: '/admin/ci-templates/.regressiontest-template.yml' - local: '/admin/ci-templates/.release-template.yml' diff --git a/docs/dev-manual/gitlab.rst b/docs/dev-manual/gitlab.rst index 75988df7c0..ad47179f83 100644 --- a/docs/dev-manual/gitlab.rst +++ b/docs/dev-manual/gitlab.rst @@ -50,11 +50,8 @@ or passed along to the environment of executed commands. Other important variable keys are as follows. .. glossary:: - CACHE_FALLBACK_KEY - *TODO: consumer?* + CMAKE_MPI_OPTIONS + Provide CMake command line arguments to define GROMACS MPI build options. - BUILD_DIR - *TODO: consumer? impact? conventions/heuristics?* - - INSTALL_DIR - *TODO: consumer? impact? conventions/heuristics?* +.. todo:: Define common variables. + ``BUILD_DIR``, ``INSTALL_DIR``, ``CACHE_FALLBACK_KEY``, ... -- 2.11.4.GIT