Merge branch 'NOAA-EMC:develop' into ci-testing

FernandoAndrade-NOAA · Dec 3, 2024 · 4e8e665 · 4e8e665
2 parents a350aa9 + b9ea91f
commit 4e8e665
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -35,14 +35,14 @@ jobs:
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: UPP
 
       # Cache spack, compiler and dependencies
       - name: cache-env
         id: cache-env
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             spack
@@ -71,13 +71,13 @@ jobs:
 
     steps:
       - name: checkout-upp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: UPP
 
       - name: cache-env
         id: cache-env
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             spack

diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml
@@ -38,14 +38,14 @@ jobs:
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
         if: steps.cache-env.outputs.cache-hit != 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: UPP
 
       # Cache spack, compiler and dependencies
       - name: cache-env
         id: cache-env
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             spack
@@ -84,7 +84,7 @@ jobs:
 
     steps:
       - name: checkout-upp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
             path: UPP
 
@@ -94,7 +94,7 @@ jobs:
 
       - name: cache-env
         id: cache-env
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             spack

diff --git a/modulefiles/jet.lua b/modulefiles/jet.lua
@@ -2,15 +2,15 @@ help([[
 Load environment to build UPP on Jet
 ]])
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.8.0/envs/ue-intel-2021.5.0/install/modulefiles/Core/")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
 load(pathJoin("cmake", cmake_ver))
 
 load("upp_common")