Skip to content

Commit

Permalink
updating spack
Browse files Browse the repository at this point in the history
  • Loading branch information
AlysonStahl-NOAA committed Jun 3, 2024
1 parent 77761de commit 2906ce2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/Spack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
pic: ["+pic", "~pic"]
precision: ["precision=d", "precision=4"]
w3emc: ["+w3emc", "~w3emc"]
utils: ["+utils", "~utils"]
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -46,7 +47,7 @@ jobs:
spack env activate g2-env
cp $GITHUB_WORKSPACE/g2/spack/package.py $SPACK_ROOT/var/spack/repos/builtin/packages/g2/package.py
spack develop --no-clone --path $GITHUB_WORKSPACE/g2 g2@develop
spack add g2@develop%gcc@11 ${{ matrix.pic }} ${{ matrix.precision }} ${{ matrix.w3emc }}
spack add g2@develop%gcc@11 ${{ matrix.pic }} ${{ matrix.precision }} ${{ matrix.w3emc }} ${{ matrix.utils }}
spack external find cmake gmake
spack concretize
# Run installation and run CTest suite
Expand All @@ -58,7 +59,7 @@ jobs:
uses: actions/upload-artifact@v3
if: ${{ failure() }}
with:
name: spackci-ctest-output-${{ matrix.os }}-${{ matrix.pic }}-${{ matrix.precision }}-${{ matrix.w3emc }}
name: spackci-ctest-output-${{ matrix.os }}-${{ matrix.pic }}-${{ matrix.precision }}-${{ matrix.w3emc }}-${{ matrix.utils }}
path: ${{ github.workspace }}/g2/spack-build-*/Testing/Temporary/LastTest.log


Expand Down
1 change: 1 addition & 0 deletions spack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class G2(CMakePackage):
depends_on("libpng")
depends_on("zlib-api")
depends_on("bacio", when="@3.4.6:")
depends_on("[email protected]: +utils", when="+tests")
depends_on("ip")
depends_on("ip precision=d", when="^[email protected]:")
depends_on("sp", when="^ip@:4")
Expand Down

0 comments on commit 2906ce2

Please sign in to comment.