Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…

…eature/ubuntu-ci-c6a_workflow
JCSDA · Apr 22, 2024 · ab19ed9 · ab19ed9
2 parents 9d6c6ae + dc9c67f
commit ab19ed9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/configs/common/modules_lmod.yaml b/configs/common/modules_lmod.yaml
@@ -137,6 +137,10 @@ modules:
           ^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
           ^[email protected]~debug snapshot=none: 'esmf-8.6.0'
           ^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
+          ^[email protected]~debug snapshot=b04: 'esmf-8.6.1b04'
+          ^[email protected]+debug snapshot=b04: 'esmf-8.6.1b04-debug'
+          ^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
+          ^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
       openmpi:
         environment:
           set:

diff --git a/configs/common/modules_tcl.yaml b/configs/common/modules_tcl.yaml
@@ -139,6 +139,10 @@ modules:
           ^[email protected]+debug snapshot=none: 'esmf-8.5.0-debug'
           ^[email protected]~debug snapshot=none: 'esmf-8.6.0'
           ^[email protected]+debug snapshot=none: 'esmf-8.6.0-debug'
+          ^[email protected]~debug snapshot=b04: 'esmf-8.6.1b04'
+          ^[email protected]+debug snapshot=b04: 'esmf-8.6.1b04-debug'
+          ^[email protected]~debug snapshot=b04: 'esmf-8.7.0b04'
+          ^[email protected]+debug snapshot=b04: 'esmf-8.7.0b04-debug'
       openmpi:
         environment:
           set:

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -60,6 +60,10 @@
     esmf:
       version: ['8.6.0']
       variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio
+      #version: ['8.6.1b04']
+      #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio
+      #version: ['8.7.0b04']
+      #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio
       require:
         - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"']
           when: "%intel"

diff --git a/spack b/spack
+2 −2		.github/workflows/unit_tests.yaml
+2 −2		.github/workflows/valid-style.yml
+2 −0		var/spack/repos/builtin/packages/esmf/package.py