use a common spack.yaml and do sed stuff in workflow

ufs-community · Aug 16, 2023 · 499fb1a · 499fb1a
1 parent ddaf1fe
commit 499fb1a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 31 deletions.
diff --git a/.github/workflows/macos_clang.yaml b/.github/workflows/macos_clang.yaml
@@ -39,15 +39,16 @@ jobs:
           path: |
             spack
             ~/.spack
-          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ufs_utils/ci/spack_macOS.yaml') }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ufs_utils/ci/spack.yaml') }}
 
       # Install dependencies using Spack
       - name: install-dependencies-with-spack
         if: steps.cache-env.outputs.cache-hit != 'true'
         run: |
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create ufs_utils-env ufs_utils/ci/spack_macOS.yaml
+          sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[apple-clang@14\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml
+          spack env create ufs_utils-env spack_ci.yaml
           spack env activate ufs_utils-env
           spack external find
           spack add openmpi@4.1.5
@@ -73,7 +74,7 @@ jobs:
           path: |
             spack
             ~/.spack
-          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ufs_utils/ci/spack_macOS.yaml') }}
+          key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ufs_utils/ci/spack.yaml') }}
 
       - name: build
         run: |

diff --git a/.github/workflows/ubuntu_gcc.yaml b/.github/workflows/ubuntu_gcc.yaml
@@ -47,7 +47,8 @@ jobs:
         run: |
           git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create ufs_utils-env ufs_utils/ci/spack.yaml
+          sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[gcc@10:10\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml
+          spack env create ufs_utils-env spack_ci.yaml
           spack env activate ufs_utils-env
           sudo apt install cmake
           spack external find

diff --git a/.github/workflows/ubuntu_intel.yaml b/.github/workflows/ubuntu_intel.yaml
@@ -59,7 +59,8 @@ jobs:
         run: |
           git clone -c feature.manyFiles=true https://github.com/NOAA-EMC/spack.git
           source spack/share/spack/setup-env.sh
-          spack env create ufs_utils-env ufs_utils/ci/spack.yaml
+          sed "s/\[intel, gcc@10:10, apple-clang@14\]/\[intel\]/g" ufs_utils/ci/spack.yaml > spack_ci.yaml
+          spack env create ufs_utils-env spack_ci.yaml
           spack env activate ufs_utils-env
           spack compiler find
           sudo apt install cmake

diff --git a/ci/spack.yaml b/ci/spack.yaml
@@ -2,9 +2,7 @@
 spack:
   packages:
     all:
-      compiler:
-      - intel
-      - gcc@10:10
+      compiler: [intel, gcc@10:10, apple-clang@14]
   specs:
   - netcdf-c@4.7.4
   - netcdf-fortran@4.5.3

diff --git a/ci/spack_macOS.yaml b/ci/spack_macOS.yaml