Skip to content

Commit

Permalink
Merge pull request #8 from sstsimulator/ci-fixes
Browse files Browse the repository at this point in the history
CI fixes
  • Loading branch information
berquist authored Mar 11, 2024
2 parents 300c9d0 + d782a14 commit 2ab376f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/build-spack-nodeps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ jobs:
run: |
echo "${PWD}/spack/bin" >> "${GITHUB_PATH}"
echo "mirror_name=github-container-registry" >> "${GITHUB_ENV}"
- name: Find compilers for Spack
run: |
spack compiler find --mixed-toolchain
- name: Print Spack configuration
run: |
spack config blame config
Expand All @@ -54,10 +57,14 @@ jobs:
- name: Install sst-core, sst-elements, and sst-macro
run: |
eval "$(spack env activate --sh .)"
# workaround for 2.42 installation issues on macOS
spack add binutils@2.41
spack add sst-core@${{ matrix.version }}
spack add sst-elements@${{ matrix.version }}
spack add sst-macro@${{ matrix.version }}
spack install --fail-fast --verbose
# macro is causing problems on macOS
# spack add sst-macro@${{ matrix.version }}
spack concretize --reuse --force
spack install --fail-fast
- name: Push packages and update index
run: |
eval "$(spack env activate --sh .)"
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
*.pyc
.spack-env/
\#spack.yaml#
._sst-spack-view/
spack.lock
sst-spack-view

0 comments on commit 2ab376f

Please sign in to comment.