diff --git a/.github/workflows/macos_clang.yaml b/.github/workflows/macos_clang.yaml index 50382cbb7..25f6bc693 100644 --- a/.github/workflows/macos_clang.yaml +++ b/.github/workflows/macos_clang.yaml @@ -39,7 +39,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') }} # Install dependencies using Spack - name: install-dependencies-with-spack @@ -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_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 index ec7eca8dd..b501ef5ef 100644 --- 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 index ef801020a..f936c08f1 100644 --- 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 index ffbf1c97c..0549a8345 100644 --- 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 deleted file mode 100644 index 1fbd6c290..000000000 --- a/ci/spack_macOS.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Spack environment file to build UFS utilities dependencies -spack: - packages: - all: - compiler: - - apple-clang@14 - specs: - - netcdf-c@4.7.4 - - netcdf-fortran@4.5.3 - - bacio@2.4.1 - - g2@3.4.5 - - ip@3.3.3 - - nemsio@2.5.4 - - sp@2.3.3 - - w3emc@2.9.2 - - sfcio@1.4.1 - - sigio@2.3.2 - - nccmp@1.9.0.1 - - parallelio@2.5.9+fortran~pnetcdf - - esmf@8.4.2~debug~xerces+external-parallelio - view: true - concretizer: - unify: true