diff --git a/Jenkinsfile b/Jenkinsfile index 62b7581438baaf8aac8698ba0de69113e06b403c..bdf48fa2a7e624d2db49b93ce06dfdec134a0777 100644 --- a/Jenkinsfile +++ b/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. diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake index 1c80c67a221310384d2046eb322f1c4a4bb43f29..ba7381a96163769eee32628b8042090a38b64100 100644 --- a/scripts/cmake/CompilerSetup.cmake +++ b/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) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index 9a608772534843f41ad0d56ae88eaf4bdabbf7f5..62b62e5b49aa8a3cfe7ddbd85631a4861ee0e678 100644 --- a/scripts/cmake/Find.cmake +++ b/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 ### diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake index a1eb99ae6bd269a9a33272a0508b8e9e575aa9e5..2e3a5d794cdbda1d8e454cf04d479cfa753a850e 100644 --- a/scripts/cmake/packaging/PackagingLinux.cmake +++ b/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 diff --git a/scripts/env/eve/cli.sh b/scripts/env/eve/cli.sh index de2a2d8eebb5aa5e74c345d662cefd498e3aa221..7047c252de8729cca2cfaf89fbabcb66ccf53996 100644 --- a/scripts/env/eve/cli.sh +++ b/scripts/env/eve/cli.sh @@ -1,3 +1,10 @@ +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