Merge branch 'update-morse-cmake' into 'develop'

Update morse cmake See merge request solverstack/ScalFMM!14

Merge branch 'update-morse-cmake' into 'develop'
Update morse cmake See merge request solverstack/ScalFMM!14
b41c2e5b · COULAUD Olivier · f962fec9 · 6b573ae6 · b41c2e5b · 1deddb27
Commit b41c2e5b authored Apr 24, 2018 by COULAUD Olivier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

.gitlab-ci.yml .gitlab-ci.yml +4 -5

CMakeModules/morse_cmake CMakeModules/morse_cmake +1 -1

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
-image: hpclib/scalfmm
+image: hpclib/hiepacs

 variables:
  GIT_SUBMODULE_STRATEGY: normal
@@ -76,7 +76,6 @@ sonar:
  script:
    - mv Build/scalfmm-build.log .
    - source ./Utils/scripts/analysis.sh
-    - sonar-scanner |tee sonar.log
-    - if [[ $CI_REPOSITORY_URL = *"solverstack/ScalFMM"* ]] && [[ $CI_COMMIT_REF_NAME = *"develop"* ]]; then
-        sonar-scanner |tee sonar.log;
-      fi
+    - sonar-scanner |tee sonar.log;
+  only:
+    - develop@solverstack/ScalFMM
\ No newline at end of file
--- a/morse_cmake @ 1deddb27
+++ b/morse_cmake @ 1deddb27
-Subproject commit 31198c66ff51f600dde4282faed234a4c0b9cfd9
+Subproject commit 1deddb2781f62dbbf0ee9199f569e49f7346397a