From e35858cd4428564b32982e1894a92a01d35589ad Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 17 Nov 2023 11:32:21 -0700 Subject: [PATCH 1/3] Updated ecflow version to latest (5.14.0). Updated spack submodule hash to bugfix for ecflow and boost compatibility with c++17 build. Updated .gitmodules to point to the corresponding spack bugfix branch. --- .gitmodules | 6 ++++-- configs/common/packages.yaml | 2 +- spack | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f475b64..b3f402ef1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,8 +2,10 @@ path = spack #url = https://github.com/spack/spack #branch = develop - url = https://github.com/jcsda/spack - branch = jcsda_emc_spack_stack + #url = https://github.com/jcsda/spack + #branch = jcsda_emc_spack_stack + url = https://github.com/srherbener/spack + branch = bugfix/ecflow-boost-cxx17 [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 176797c21..b5608aeee 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -45,7 +45,7 @@ version: ['2.27.0'] variants: +png ecflow: - version: ['5.8.4'] + version: ['5.11.4'] variants: +ui eckit: version: ['1.24.4'] diff --git a/spack b/spack index 5cdb7cee4..a3dc7097a 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 5cdb7cee432093a0d8a65bc0f8883c55f5bf3172 +Subproject commit a3dc7097aeec10afa71cba96e403ff366f3d6f1f From c6d7204575bbba2701af7e8895b472efb68d1c00 Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 17 Nov 2023 14:24:06 -0700 Subject: [PATCH 2/3] Updated spack submodule hash, restored .gitmodules --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index a3dc7097a..42fbcfb1a 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit a3dc7097aeec10afa71cba96e403ff366f3d6f1f +Subproject commit 42fbcfb1af07d09e30469ac1d37979a64f25ce19 From ab0cda8a9474c24093033da0b9d9979c803b8399 Mon Sep 17 00:00:00 2001 From: Stephen Herbener Date: Fri, 17 Nov 2023 14:32:10 -0700 Subject: [PATCH 3/3] Oops - forgot to add the .gitmodules file. --- .gitmodules | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3f402ef1..b1f475b64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,8 @@ path = spack #url = https://github.com/spack/spack #branch = develop - #url = https://github.com/jcsda/spack - #branch = jcsda_emc_spack_stack - url = https://github.com/srherbener/spack - branch = bugfix/ecflow-boost-cxx17 + url = https://github.com/jcsda/spack + branch = jcsda_emc_spack_stack [submodule "doc/CMakeModules"] path = doc/CMakeModules url = https://github.com/noaa-emc/cmakemodules