diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index bf18a8cead..647ac8c185 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -65,7 +65,7 @@ jobs: sudo mv /usr/local /usr/local_mv # Install NetCDF, ESMF, g2, etc using Spack . /opt/intel/oneapi/setvars.sh - git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git + git clone -c feature.manyFiles=true --depth=2 --branch=spack-stack-1.9.3 https://github.com/JCSDA/spack.git source spack/share/spack/setup-env.sh ln -s $(realpath $(which gcc)) spack/lib/spack/env/intel/gcc # spack/make bug in ESMF spack env create ww3-intel ww3/model/ci/spack_intel.yaml diff --git a/.github/workflows/regtest_gnu.yml b/.github/workflows/regtest_gnu.yml index 642a1cb2d0..78ac1e4ff6 100644 --- a/.github/workflows/regtest_gnu.yml +++ b/.github/workflows/regtest_gnu.yml @@ -126,5 +126,5 @@ jobs: id: cache-data uses: actions/cache@v3 with: - path: ww3/ww3_from_ftp.v7.14.1.tar.gz - key: ww3_from_ftp.v7.14.1 + path: ww3/ww3_from_ftp.v7.14.2.tar.gz + key: ww3_from_ftp.v7.14.2 diff --git a/model/ci/spack_gnu.yaml b/model/ci/spack_gnu.yaml index 6003d7594d..de6caaaf86 100644 --- a/model/ci/spack_gnu.yaml +++ b/model/ci/spack_gnu.yaml @@ -3,6 +3,8 @@ spack: all: compiler: - gcc@10.0:10 + target: + - x86_64_v3 specs: - metis@5.1.0~shared - parmetis@4.0.3~shared diff --git a/model/ci/spack_intel.yaml b/model/ci/spack_intel.yaml index 17079194f8..b1b65e011f 100644 --- a/model/ci/spack_intel.yaml +++ b/model/ci/spack_intel.yaml @@ -2,8 +2,11 @@ spack: packages: all: compiler: [intel] + target: [x86_64_v3] providers: mpi: [intel-oneapi-mpi] + python: + require: "@3.11" specs: - netcdf-c@4.9.2~dap - netcdf-fortran@4.6.1