Skip to content

Commit

Permalink
Merge branch 'release/1.8.0' of https://github.com/jcsda/spack-stack
Browse files Browse the repository at this point in the history
…into feature/rel180_update_nrl_site_configs
  • Loading branch information
climbfuji committed Sep 3, 2024
2 parents a797e10 + a5c5a2a commit b05c584
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 18 deletions.
2 changes: 0 additions & 2 deletions configs/sites/tier1/discover-scu16/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ modules:
enable::
- lmod
lmod:
exclude:
- ecflow
include:
- python
8 changes: 1 addition & 7 deletions configs/sites/tier1/discover-scu16/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
ecflow::
buildable: False
externals:
- spec: [email protected]+ui+static_boost
prefix: /discover/swdev/jcsda/spack-stack/ecflow-5.8.4
modules:
- ecflow/5.8.4
file:
externals:
- spec: [email protected]
Expand Down Expand Up @@ -129,6 +122,7 @@ packages:
- spec: [email protected]
prefix: /usr
qt:
buildable: False
externals:
- spec: [email protected]
prefix: /discover/swdev/jcsda/spack-stack/qt-5.15.2/5.15.2/gcc_64
Expand Down
2 changes: 0 additions & 2 deletions configs/sites/tier1/discover-scu17/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ modules:
enable::
- lmod
lmod:
exclude:
- ecflow
include:
- python
8 changes: 1 addition & 7 deletions configs/sites/tier1/discover-scu17/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
ecflow::
buildable: False
externals:
- spec: [email protected]+ui+static_boost
prefix: /discover/swdev/jcsda/spack-stack/scu17/ecflow-5.11.4
modules:
- ecflow/5.11.4
findutils:
externals:
- spec: [email protected]
Expand Down Expand Up @@ -119,6 +112,7 @@ packages:
- spec: [email protected]
prefix: /usr
qt:
buildable: False
externals:
- spec: [email protected]
prefix: /usr/local/other/xpdf/4.04/Deps
Expand Down

0 comments on commit b05c584

Please sign in to comment.