diff --git a/.github/workflows/Spack_Linux.yml b/.github/workflows/Spack_Linux.yml index 1a8958dc..b511024f 100644 --- a/.github/workflows/Spack_Linux.yml +++ b/.github/workflows/Spack_Linux.yml @@ -35,7 +35,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/spack/spack . spack/share/spack/setup-env.sh - spack env create grib-util-env + spack env create grib-util-env $GITHUB_WORKSPACE/grib-util/spack/spack.yaml spack env activate grib-util-env cp $GITHUB_WORKSPACE/grib-util/spack/package.py $SPACK_ROOT/var/spack/repos/builtin/packages/grib-util/package.py mv $GITHUB_WORKSPACE/grib-util $SPACK_ENV/grib-util diff --git a/.github/workflows/Spack_MacOS.yml b/.github/workflows/Spack_MacOS.yml index 6b2aa500..ad7d765b 100644 --- a/.github/workflows/Spack_MacOS.yml +++ b/.github/workflows/Spack_MacOS.yml @@ -33,7 +33,7 @@ jobs: run: | git clone -c feature.manyFiles=true https://github.com/spack/spack . spack/share/spack/setup-env.sh - spack env create grib-util-env + spack env create grib-util-env $GITHUB_WORKSPACE/grib-util/spack/spack.yaml spack env activate grib-util-env cp $GITHUB_WORKSPACE/grib-util/spack/package.py $SPACK_ROOT/var/spack/repos/builtin/packages/grib-util/package.py mv $GITHUB_WORKSPACE/grib-util $SPACK_ENV/grib-util diff --git a/ci/spack.yaml b/ci/spack.yaml deleted file mode 100644 index a69a4102..00000000 --- a/ci/spack.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Spack environment file to build NCEPLIBS-grib_util dependencies. -# -# Ed Hartnett 12/20/22 -spack: - packages: - all: - compiler: - - intel - - gcc@10:10 - specs: - - bacio@2.5.0 - - w3emc@2.10.0 - - g2@3.4.6 - - g2c@1.7.0 - - sp@2.3.3 - - ip@4.1.0 - view: true - concretizer: - unify: true - diff --git a/spack/spack.yaml b/spack/spack.yaml new file mode 100644 index 00000000..16893953 --- /dev/null +++ b/spack/spack.yaml @@ -0,0 +1,20 @@ +# Spack environment file to build NCEPLIBS-grib_util dependencies. +# +# Ed Hartnett 12/20/22 +spack: + packages: + bacio: + version: ['2.5.0'] + w3emc: + version: ['2.10.0'] + g2: + version: ['3.4.6'] + g2c: + version: ['1.7.0'] + sp: + version: ['2.3.3'] + ip: + version: ['4.1.0'] + view: false + concretizer: + unify: true