Second beta release of 2018

Updated release matrix because bs_nix-amd is unreliable

Change-Id: I34262535e7a9cffc21e83fff60570605fbe7955f

diff --git a/admin/builds/release-matrix.txt b/admin/builds/release-matrix.txt
index f2ae510c5211e2cb0db187a9c22d2e5829b00ca6..4d522c455808af5e550018584bb49224b8d71bc6 100644 (file)
--- a/admin/builds/release-matrix.txt
+++ b/admin/builds/release-matrix.txt
@@ -23,7 +23,7 @@
 # Test oldest supported gcc at time of release
 # Test mpi support
 # Test mdrun-only build
-gcc-4.8 mpi mdrun-only release
+gcc-4.8 mpi mdrun-only release cmake-3.8.1
 
 # Test static linking with gcc
 # Test newest gcc at time of release
@@ -36,7 +36,10 @@ icc-18 double release
 # Test static linking with clang
 # Test double precision
 # Test newest supported clang version
-clang-4 static double release
+clang-5 static double release cmake-3.6.1
 
 # Test with GPU support
 gcc-5 gpu cuda-8.0 release
+
+# TODO items
+# Avoid specifying cmake versions just to move jobs away from bs_nix-amd

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index 74eabbea4a0b3c16e2a037251c766307c46260c8..263f4f86c21f61581fcaa4fea400aa439c0b6099 100644 (file)
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -191,7 +191,7 @@ set(GMX_VERSION_PATCH 0)
 # candidates, where it signifies the most recent such release from
 # this branch; it will be empty before the first such release, as well
 # as after the final release is out.
-set(GMX_VERSION_SUFFIX "-beta1")
+set(GMX_VERSION_SUFFIX "-beta2")
 
 # Conventionally with libtool, any ABI change must change the major
 # version number, the minor version number should change if it's just
@@ -226,7 +226,7 @@ endif()
 
 set(REGRESSIONTEST_VERSION "${GMX_VERSION_STRING}")
 set(REGRESSIONTEST_BRANCH "refs/heads/release-2018")
-set(REGRESSIONTEST_MD5SUM "dd80f07a36e10c8cb44c72c3ac3a8705" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
+set(REGRESSIONTEST_MD5SUM "ebfdb7f7b0c70a03038655ee12b18300" CACHE INTERNAL "MD5 sum of the regressiontests tarball")
 
 math(EXPR GMX_VERSION_NUMERIC
      "${GMX_VERSION_MAJOR}*10000 + ${GMX_VERSION_PATCH}")