Merge branch 'release-2.1.0-rc6'

cp2k · Mar 9, 2020 · 9281580 · 9281580
2 parents 40a8e91 + cf129f2
commit 9281580
Show file tree

Hide file tree

Showing 37 changed files with 539 additions and 1,005 deletions.
diff --git a/.ci/daint.cscs.ch/Jenkinsfile b/.ci/daint.cscs.ch/Jenkinsfile
@@ -59,17 +59,6 @@ pipeline {
                         }
                     }
                 }
-                stage("GNU CMake 3.10 build-only") {
-                    // we don't need a full build,
-                    // just checking that we can still configure using CMake 3.10
-                    stages {
-                        stage('build') {
-                            steps {
-                                run_batch("0:15:00", "gnu-cmake-3.10", "build")
-                            }
-                        }
-                    }
-                }
                 stage("Intel") {
                     stages {
                         stage('build') {

diff --git a/.ci/daint.cscs.ch/gnu-cmake-3.10.build.sh b/.ci/daint.cscs.ch/gnu-cmake-3.10.build.sh