From 77b924bbee8b90e9a1dd1b497944e98dc637417f Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 12:58:57 +0100
Subject: [PATCH 01/15] Fix condition for travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8ae76568884..cce80a99a5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -160,7 +160,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" && ! -z "$TRAVIS_TAG" ] ; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ ! -z "$TRAVIS_TAG" ] ; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From 4a587292c7d19106f75415bea36b3e006ebfdb7a Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 14:00:20 +0100
Subject: [PATCH 02/15] Fix deployment path

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cce80a99a5a..a125fb646c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ jobs:  # the following jobs inherit only the first OS
     - pre-commit run --hook-stage manual --all-files check-ast
   - stage: release
     name: "Build release tarball and documentation and deploy to GitHub"
-    if: tag IS present
+    if: tag IS NOT present
     script:
       - mkdir -p build
       - cd build
@@ -96,7 +96,7 @@ jobs:  # the following jobs inherit only the first OS
         secure: ID+AX1LOPs+BRGpZiYgP0H9gvOBF/a/o1tNUNDY7Mbo6uShpwVcmYxpqW/2zbWrHXeG4TNZEATED2Yw1nSSp0wj7z/t6ScDuttvYwuN8AExauW7y4WrU5o3qGCGuc9ClDmj3lnQsjqjkmFkqZasmnh2MKHldcDM5cluNs1o/48a/nJ55TEsplKvsPn6gzi+XIs0zY/yIFEZxWEeXs7SlR3Jr+0nDMBHdllnEV/AxdQGQ7y2w6sXN26B7PZNM97kQ8qBGUPnnj41vHtAvT1rGu/N7TcRu+P0n9JmPtC+ZpzBNU8RfI0YJgFOjhORP9gwUNrwNSLZBqJECo2+s6QhjZ7x+UVF9CBQePUnRPJxMjkFVKqfykd7NtREaFJiwwfcWXSq7naVj1n4aNN19jO1myeSP/4WAGMBmEHXSlaDj1jqyaijwPC9YxVeMovTwlDdg0Iv/ZsjE4+MFcgyUU8f0h5x94gbsxgmKPUMaQeuMhdw41wAQm0KcDANwWNyiiGiyw5h0QJcjvg1/HDsrfID0vgqXXMXCfbLEMwpJLWj8F5Htc/D2gGfvepLy9+chqGF/53ntpTPEkF9V1f8ke6QZv7cJhi7U7IOmxWE6OFObPB1auT6g+Got10zkzNDWulk7g6thIFZlarpYqVKUWMfhb3i0ndJLk24L6iJhRuxtp90=
       cleanup: false
       keep_history: true
-      local_dir: build/doc/
+      local_dir: doc/
       on:
         repo: cp2k/dbcsr
         tags: true  # default is "restricted by branch"

From f03ed9201673f814169fc67dae727e7049757d7b Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 14:31:59 +0100
Subject: [PATCH 03/15] Try deployment

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a125fb646c3..be569ec7e89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,12 +35,12 @@ env:
   - NINJA_VERSION=1.9.0.g99df1.kitware.dyndep-1.jobserver-1
   jobs:
   - USE_MPI=ON USE_OPENMP=ON USE_SMM=blas
-  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
-  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
-  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
-  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
-  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
-  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
+#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
+#  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
+#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
 
 jobs:  # the following jobs inherit only the first OS
   exclude:
@@ -90,7 +90,7 @@ jobs:  # the following jobs inherit only the first OS
       target_commitish: $TRAVIS_COMMIT
       on:
         repo: cp2k/dbcsr
-        tags: true  # default is "restricted by branch"
+#        tags: true  # default is "restricted by branch"
     - provider: pages
       token:  # encrypted token of the `dbcsr` GitHub service user
         secure: ID+AX1LOPs+BRGpZiYgP0H9gvOBF/a/o1tNUNDY7Mbo6uShpwVcmYxpqW/2zbWrHXeG4TNZEATED2Yw1nSSp0wj7z/t6ScDuttvYwuN8AExauW7y4WrU5o3qGCGuc9ClDmj3lnQsjqjkmFkqZasmnh2MKHldcDM5cluNs1o/48a/nJ55TEsplKvsPn6gzi+XIs0zY/yIFEZxWEeXs7SlR3Jr+0nDMBHdllnEV/AxdQGQ7y2w6sXN26B7PZNM97kQ8qBGUPnnj41vHtAvT1rGu/N7TcRu+P0n9JmPtC+ZpzBNU8RfI0YJgFOjhORP9gwUNrwNSLZBqJECo2+s6QhjZ7x+UVF9CBQePUnRPJxMjkFVKqfykd7NtREaFJiwwfcWXSq7naVj1n4aNN19jO1myeSP/4WAGMBmEHXSlaDj1jqyaijwPC9YxVeMovTwlDdg0Iv/ZsjE4+MFcgyUU8f0h5x94gbsxgmKPUMaQeuMhdw41wAQm0KcDANwWNyiiGiyw5h0QJcjvg1/HDsrfID0vgqXXMXCfbLEMwpJLWj8F5Htc/D2gGfvepLy9+chqGF/53ntpTPEkF9V1f8ke6QZv7cJhi7U7IOmxWE6OFObPB1auT6g+Got10zkzNDWulk7g6thIFZlarpYqVKUWMfhb3i0ndJLk24L6iJhRuxtp90=
@@ -99,7 +99,7 @@ jobs:  # the following jobs inherit only the first OS
       local_dir: doc/
       on:
         repo: cp2k/dbcsr
-        tags: true  # default is "restricted by branch"
+#        tags: true  # default is "restricted by branch"
 
 install:
   - DEPS_DIR="${HOME}/deps"
@@ -160,7 +160,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ ! -z "$TRAVIS_TAG" ] ; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] ; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From 375f8a0680f6dee44d49bfd32a176c4595f915ca Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 14:31:59 +0100
Subject: [PATCH 04/15] Restore deployment for tags

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a125fb646c3..be569ec7e89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,12 +35,12 @@ env:
   - NINJA_VERSION=1.9.0.g99df1.kitware.dyndep-1.jobserver-1
   jobs:
   - USE_MPI=ON USE_OPENMP=ON USE_SMM=blas
-  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
-  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
-  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
-  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
-  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
-  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
+#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
+#  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
+#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
+#  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
 
 jobs:  # the following jobs inherit only the first OS
   exclude:
@@ -90,7 +90,7 @@ jobs:  # the following jobs inherit only the first OS
       target_commitish: $TRAVIS_COMMIT
       on:
         repo: cp2k/dbcsr
-        tags: true  # default is "restricted by branch"
+#        tags: true  # default is "restricted by branch"
     - provider: pages
       token:  # encrypted token of the `dbcsr` GitHub service user
         secure: ID+AX1LOPs+BRGpZiYgP0H9gvOBF/a/o1tNUNDY7Mbo6uShpwVcmYxpqW/2zbWrHXeG4TNZEATED2Yw1nSSp0wj7z/t6ScDuttvYwuN8AExauW7y4WrU5o3qGCGuc9ClDmj3lnQsjqjkmFkqZasmnh2MKHldcDM5cluNs1o/48a/nJ55TEsplKvsPn6gzi+XIs0zY/yIFEZxWEeXs7SlR3Jr+0nDMBHdllnEV/AxdQGQ7y2w6sXN26B7PZNM97kQ8qBGUPnnj41vHtAvT1rGu/N7TcRu+P0n9JmPtC+ZpzBNU8RfI0YJgFOjhORP9gwUNrwNSLZBqJECo2+s6QhjZ7x+UVF9CBQePUnRPJxMjkFVKqfykd7NtREaFJiwwfcWXSq7naVj1n4aNN19jO1myeSP/4WAGMBmEHXSlaDj1jqyaijwPC9YxVeMovTwlDdg0Iv/ZsjE4+MFcgyUU8f0h5x94gbsxgmKPUMaQeuMhdw41wAQm0KcDANwWNyiiGiyw5h0QJcjvg1/HDsrfID0vgqXXMXCfbLEMwpJLWj8F5Htc/D2gGfvepLy9+chqGF/53ntpTPEkF9V1f8ke6QZv7cJhi7U7IOmxWE6OFObPB1auT6g+Got10zkzNDWulk7g6thIFZlarpYqVKUWMfhb3i0ndJLk24L6iJhRuxtp90=
@@ -99,7 +99,7 @@ jobs:  # the following jobs inherit only the first OS
       local_dir: doc/
       on:
         repo: cp2k/dbcsr
-        tags: true  # default is "restricted by branch"
+#        tags: true  # default is "restricted by branch"
 
 install:
   - DEPS_DIR="${HOME}/deps"
@@ -160,7 +160,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ ! -z "$TRAVIS_TAG" ] ; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] ; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From fff8917386aa99fa532e755482945ee8ae35ad15 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 14:57:20 +0100
Subject: [PATCH 05/15] Restore deployment

---
 .travis.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be569ec7e89..ddf55e953cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,12 +35,12 @@ env:
   - NINJA_VERSION=1.9.0.g99df1.kitware.dyndep-1.jobserver-1
   jobs:
   - USE_MPI=ON USE_OPENMP=ON USE_SMM=blas
-#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
-#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
-#  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
-#  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
-#  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
-#  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
+  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=blas
+  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=blas
+  - USE_MPI=ON USE_OPENMP=ON USE_SMM=libxsmm
+  - USE_MPI=OFF USE_OPENMP=ON USE_SMM=libxsmm
+  - USE_MPI=ON USE_OPENMP=OFF USE_SMM=libxsmm
+  - USE_MPI=OFF USE_OPENMP=OFF USE_SMM=libxsmm
 
 jobs:  # the following jobs inherit only the first OS
   exclude:
@@ -70,7 +70,7 @@ jobs:  # the following jobs inherit only the first OS
     - pre-commit run --hook-stage manual --all-files check-ast
   - stage: release
     name: "Build release tarball and documentation and deploy to GitHub"
-    if: tag IS NOT present
+    if: tag IS present
     script:
       - mkdir -p build
       - cd build
@@ -90,7 +90,7 @@ jobs:  # the following jobs inherit only the first OS
       target_commitish: $TRAVIS_COMMIT
       on:
         repo: cp2k/dbcsr
-#        tags: true  # default is "restricted by branch"
+        tags: true  # default is "restricted by branch"
     - provider: pages
       token:  # encrypted token of the `dbcsr` GitHub service user
         secure: ID+AX1LOPs+BRGpZiYgP0H9gvOBF/a/o1tNUNDY7Mbo6uShpwVcmYxpqW/2zbWrHXeG4TNZEATED2Yw1nSSp0wj7z/t6ScDuttvYwuN8AExauW7y4WrU5o3qGCGuc9ClDmj3lnQsjqjkmFkqZasmnh2MKHldcDM5cluNs1o/48a/nJ55TEsplKvsPn6gzi+XIs0zY/yIFEZxWEeXs7SlR3Jr+0nDMBHdllnEV/AxdQGQ7y2w6sXN26B7PZNM97kQ8qBGUPnnj41vHtAvT1rGu/N7TcRu+P0n9JmPtC+ZpzBNU8RfI0YJgFOjhORP9gwUNrwNSLZBqJECo2+s6QhjZ7x+UVF9CBQePUnRPJxMjkFVKqfykd7NtREaFJiwwfcWXSq7naVj1n4aNN19jO1myeSP/4WAGMBmEHXSlaDj1jqyaijwPC9YxVeMovTwlDdg0Iv/ZsjE4+MFcgyUU8f0h5x94gbsxgmKPUMaQeuMhdw41wAQm0KcDANwWNyiiGiyw5h0QJcjvg1/HDsrfID0vgqXXMXCfbLEMwpJLWj8F5Htc/D2gGfvepLy9+chqGF/53ntpTPEkF9V1f8ke6QZv7cJhi7U7IOmxWE6OFObPB1auT6g+Got10zkzNDWulk7g6thIFZlarpYqVKUWMfhb3i0ndJLk24L6iJhRuxtp90=
@@ -99,7 +99,7 @@ jobs:  # the following jobs inherit only the first OS
       local_dir: doc/
       on:
         repo: cp2k/dbcsr
-#        tags: true  # default is "restricted by branch"
+        tags: true  # default is "restricted by branch"
 
 install:
   - DEPS_DIR="${HOME}/deps"

From ce60161dd01c0d4432d8fb8d77f16009897f8bbc Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 15:28:54 +0100
Subject: [PATCH 06/15] Do not run coverage for pre-commit

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ddf55e953cd..5571be27618 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,8 @@ jobs:  # the following jobs inherit only the first OS
   include:
   - name: "Run pre-commit hook on changed files"
     if: tag IS NOT present
+    env:
+    - PRE_COMMIT=y
     script:
     - set -o pipefail
     # fetch remotes first to ensure that referenced branches (other than the default) are available
@@ -66,6 +68,8 @@ jobs:  # the following jobs inherit only the first OS
 
   - name: "Run pre-commit hook 'check-ast' on all files"
     if: tag IS NOT present
+    env:
+    - PRE_COMMIT=y
     script:
     - pre-commit run --hook-stage manual --all-files check-ast
   - stage: release
@@ -160,7 +164,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] ; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ -z "$PRE_COMMIT" ]; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From af2bbc1df9e50f3ae179bc71ac7bd90b22d78fd5 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 15:45:28 +0100
Subject: [PATCH 07/15] Check again to disable coverage for pre-commit tests

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5571be27618..1f2d170cf96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,7 +164,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ -z "$PRE_COMMIT" ]; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ "$PRE_COMMIT" = "y" ]; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From 2004d14daeeccf885d3198c25bcaa7f1eef50580 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 16:02:29 +0100
Subject: [PATCH 08/15] Fix bug in the previous commit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1f2d170cf96..d018e2ccb57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -164,7 +164,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ "$PRE_COMMIT" = "y" ]; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ "$PRE_COMMIT" != "y" ]; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From 2710e5a1b19f43acd6af0fbf9b66d62ec36839e0 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 16:18:02 +0100
Subject: [PATCH 09/15] Use JOB name to avoid coverage

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d018e2ccb57..ec00310cba4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,8 +57,6 @@ jobs:  # the following jobs inherit only the first OS
   include:
   - name: "Run pre-commit hook on changed files"
     if: tag IS NOT present
-    env:
-    - PRE_COMMIT=y
     script:
     - set -o pipefail
     # fetch remotes first to ensure that referenced branches (other than the default) are available
@@ -68,8 +66,6 @@ jobs:  # the following jobs inherit only the first OS
 
   - name: "Run pre-commit hook 'check-ast' on all files"
     if: tag IS NOT present
-    env:
-    - PRE_COMMIT=y
     script:
     - pre-commit run --hook-stage manual --all-files check-ast
   - stage: release
@@ -164,7 +160,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ "$PRE_COMMIT" != "y" ]; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ -z "$TRAVIS_JOB_NAME" ]; then
       cd build
       cmake --build . -- cov-info
       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"

From 91e7d226d39da718ff1bbbe2f9e36e5b0dd957ab Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 16:34:13 +0100
Subject: [PATCH 10/15] Check JOB name to avoid coverage

---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec00310cba4..23bb1e7b1cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -160,8 +160,11 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] && [ -z "$TRAVIS_JOB_NAME" ]; then
-      cd build
-      cmake --build . -- cov-info
-      bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] 
+      echo "$TRAVIS_JOB_NAME"
+      if [ "$TRAVIS_JOB_NAME" != "C" ]; then
+         cd build
+     	 cmake --build . -- cov-info
+      	 bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+      fi
     fi

From 87b7ab7b86fbb91a4aac8f4f35e92a33f2656439 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 16:42:33 +0100
Subject: [PATCH 11/15] Fix previous commit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 23bb1e7b1cc..c8b41a692ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -160,7 +160,7 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ] 
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ]; then
       echo "$TRAVIS_JOB_NAME"
       if [ "$TRAVIS_JOB_NAME" != "C" ]; then
          cd build

From 44d8e43452981aa5b3d1d833b75b734de7cf2ae5 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 17:00:08 +0100
Subject: [PATCH 12/15] Check tag name

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c8b41a692ea..d419b7a1e08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,9 +159,11 @@ script:  # multiplied by matrix envs and os settings
 after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
+  - echo "${TRAVIS_TAG}
+  - echo "${TRAVIS_JOB_NAME}"
   - |
     if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ]; then
-      echo "$TRAVIS_JOB_NAME"
+      echo "${TRAVIS_JOB_NAME}"
       if [ "$TRAVIS_JOB_NAME" != "C" ]; then
          cd build
      	 cmake --build . -- cov-info

From 372225066ef74be199f219324b3a105aff1beefe Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 17:17:07 +0100
Subject: [PATCH 13/15] Use name to avoid coverage test

---
 .travis.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d419b7a1e08..b9948b05d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,14 +159,9 @@ script:  # multiplied by matrix envs and os settings
 after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
-  - echo "${TRAVIS_TAG}
-  - echo "${TRAVIS_JOB_NAME}"
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_TAG" ]; then
-      echo "${TRAVIS_JOB_NAME}"
-      if [ "$TRAVIS_JOB_NAME" != "C" ]; then
-         cd build
-     	 cmake --build . -- cov-info
-      	 bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
-      fi
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_JOB_NAME" ]; then
+       cd build
+       cmake --build . -- cov-info
+       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
     fi

From 9e98a1393c3cf92e6b373edf4b9e46cc4afccab7 Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 17:54:54 +0100
Subject: [PATCH 14/15] Fix typo for CP2K-GPU compilation in makefile

---
 .cp2k/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cp2k/Makefile b/.cp2k/Makefile
index bd42b3bfab8..20d4f164e8b 100644
--- a/.cp2k/Makefile
+++ b/.cp2k/Makefile
@@ -135,7 +135,7 @@ ifneq (,$(findstring nvcc,$(ACC)))
 override ACCFLAGS += -D__CUDA
 CXXFLAGS += -D__CUDA
 #if "-arch" has not yet been set in ACCFLAGS
-ifeq (,$(findstring "-arch", $(ACCFLAGS)))
+ifeq (,$(findstring -arch,$(ACCFLAGS)))
 override ACCFLAGS += -arch sm_$(ARCH_NUMBER)
 endif
 # If compiling with hipcc
@@ -143,7 +143,7 @@ else ifneq (,$(findstring hipcc,$(ACC)))
 override ACCFLAGS += -D__HIP
 CXXFLAGS += -D__HIP
 #if "--amdgpu-target" has not yet been set in ACCFLAGS
-ifeq (,$(findstring "--amdgpu-target", $(ACCFLAGS)))
+ifeq (,$(findstring --amdgpu-target,$(ACCFLAGS)))
 override ACCFLAGS += --amdgpu-target=$(ARCH_NUMBER)
 endif
 endif

From c19072657da2b4a6da4c443e892f886e276d24af Mon Sep 17 00:00:00 2001
From: Alfio Lazzaro <alazzaro@cray.com>
Date: Mon, 9 Mar 2020 21:37:26 +0100
Subject: [PATCH 15/15] Bump version to 2.1.0.rc8

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 6c782255cda..7f02e971a59 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR = 2
 MINOR = 1
-PATCH = 0-rc7
+PATCH = 0-rc8
 # A specific DATE (YYYY-MM-DD) fixes an official release, otherwise
 # it is considered Development version.
 DATE  =