Unify a bit decideWhetherToUseGpusForPme* functions

[alexxy/gromacs.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee10cc660d7d4d405288c21090725d6811f9588a..5f80a76cc6ae13989cc0f7e3b1bac70ba47d204d 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,14 +24,14 @@ stages:
   - nightly-deploy
   # Release work for packaging code
   - release-package
-  # Release checksum verification
-  - release-verify
   # Configure code for release builds
   - release-configure
   # Release work for packaging code
   - release-build
   # Tests for release code
   - release-tests
+  # Release checksum verification
+  - release-verify
   # Prepare for deploying artifacts
   - release-prepare-deploy
   # Deploy stage for release builds
@@ -42,15 +42,14 @@ include:
   - local: '/admin/gitlab-ci/global.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/rules.gitlab-ci.yml'
   # gmxapi Python package.
-  - local: '/admin/gitlab-ci/python-gmxapi.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/python-gmxapi.matrix.gitlab-ci.yml'
   # Further API validation and usability of sample gmxapi extension package.
-  - local: '/admin/gitlab-ci/sample_restraint.gitlab-ci.yml'
-  # API regression testing using sample gmxapi extension package.
-  - local: '/admin/gitlab-ci/sample_restraint-regression.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/api-client.matrix.gitlab-ci.yml'
   # Build and test GROMACS in a variety of environments and configurations.
   # To do: Consider expanding matrix here to improve transparency and reduce file sizes.
   # E.g. '/admin/gitlab-ci/matrix/clang-8.gitlab-ci.yml
   - local: '/admin/gitlab-ci/gromacs.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml'
   # Repository cleanliness. Source tidiness, linting, and policy compliance.
   - local: '/admin/gitlab-ci/lint.gitlab-ci.yml'
   # Web page and manual.