Merge pull request #2524 from bilke/eve-deploy-fix

Eve deploy fix

Jenkinsfile

@@ -28,7 +28,7 @@ pipeline {
       agent { label "master"}
       steps {
         sh "git config core.whitespace -blank-at-eof"
-        sh "git diff --check `git merge-base origin/master HEAD` HEAD -- . ':!*.md' ':!*.pandoc' ':!*.asc'"
+        sh "git diff --check `git merge-base origin/master HEAD` HEAD -- . ':!*.md' ':!*.pandoc' ':!*.asc' ':!*.dat'"
         dir('scripts/jenkins') { stash(name: 'known_hosts', includes: 'known_hosts') }
         ciSkip action: 'check' // Check for [ci skip] or [web] commit message.
 

scripts/cmake/CompilerSetup.cmake

@@ -85,8 +85,8 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
     endif()
 
     if(COMPILER_IS_GCC)
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.2")
-            message(FATAL_ERROR "GCC minimum required version is 6.2! You are \
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.3")
+            message(FATAL_ERROR "GCC minimum required version is 7.3! You are \
                 using ${CMAKE_CXX_COMPILER_VERSION}.")
         endif()
         add_compile_options(-fext-numeric-literals)

scripts/cmake/Find.cmake

@@ -44,7 +44,7 @@ find_program(PIP pip)
 find_program(PANDOC_CITEPROC pandoc-citeproc)
 
 find_program(MODULE_CMD modulecmd
-    PATHS /usr/local/modules/3.3.4-1/Modules/3.3.4/bin)
+    PATHS /usr/local/modules/3.2.10-1/Modules/3.2.10/bin)
 
 ######################
 ### Find libraries ###

scripts/cmake/packaging/PackagingLinux.cmake

@@ -22,6 +22,10 @@ if(MODULE_CMD)
         install(FILES ${PROJECT_BINARY_DIR}/module.lua DESTINATION ${MODULE_DIR}
             RENAME ${MODULE_NAME}.lua)
     endif()
+else()
+    if("${HOSTNAME}" MATCHES "frontend.*")
+        message(FATAL_ERROR "MODULE_CMD not found but required on eve frontends!")
+    endif()
 endif()
 
 set(README_PLATFORM_INSTRUCTIONS

scripts/env/eve/cli.sh

+if [ ! -f ~/.easybuild-yes ]; then
+    echo "ERROR: Easybuild modules not enabled but required!\n"
+    echo "Run 'touch ~/.easybuild-yes' and re-login to enable."
+    echo "For more details see:\n  https://www.opengeosys.org/docs/devguide/advanced/working-on-eve"
+    return 1
+fi
+
 module use /global/apps/modulefiles
 
 module load cmake