Skip to content

Commit

Permalink
Merge 6de3964 into f9b61cb
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed Apr 12, 2021
2 parents f9b61cb + 6de3964 commit eef02b3
Show file tree
Hide file tree
Showing 36 changed files with 57 additions and 579 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -1,3 +1,6 @@
[submodule "src/blt"]
path = src/blt
url = https://github.com/LLNL/blt.git
[submodule "scripts/uberenv"]
path = scripts/uberenv
url = https://github.com/LLNL/uberenv.git
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -194,7 +194,7 @@ script:
- while sleep 540; do echo "=====[ $SECONDS seconds still running ]====="; done &
# build deps using uberenv
# use -k to avoid suprises related to certs
- python scripts/uberenv/uberenv.py -k --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv/spack_configs/travis/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/ || travis_terminate 1;
- python scripts/uberenv/uberenv.py -k --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/travis/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/ || travis_terminate 1;
# todo:
#- export SPACK_PYTHON_BIN_DIR=`ls -d ${TRAVIS_BUILD_DIR}/uberenv_libs/spack/opt/spack/*/*/python*/bin`
#- pip install cpp-coveralls
Expand Down
8 changes: 6 additions & 2 deletions scripts/uberenv/project.json → .uberenv_config.json
@@ -1,8 +1,12 @@
{
"package_name" : "conduit",
"uberenv_package_name" : "uberenv-conduit",
"package_version" : "develop",
"package_source_dir" : "../../",
"spack_build_mode" : "uberenv-pkg",
"spack_configs_path": "scripts/uberenv_configs/spack_configs",
"spack_packages_path": "scripts/uberenv_configs/packages",
"spack_url": "https://github.com/alpine-DAV/spack",
"spack_branch": "task/2020_11_conduit_uberenv",
"spack_branch": "conduit/develop",
"mirror_url": "https://www.ascent-dav.org/mirror/conduit/latest/",
"spack_activate" : {"py-numpy" : ["+python"],
"py-sphinx": ["+python","+doc"],
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Expand Up @@ -202,7 +202,7 @@ stages:
# show final spec
echo $SPACK_SPEC
# run uber to build tpls
python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/
python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/
displayName: 'Spack Build Tpls'
- script: |
Expand Down Expand Up @@ -428,7 +428,7 @@ stages:
# show final spec
echo $SPACK_SPEC
# run uber to build tpls
python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/
python scripts/uberenv/uberenv.py -k --pull --spec "${SPACK_SPEC}" --spack-config-dir=scripts/uberenv_configs/spack_configs/ci/ubuntu_16/ --mirror=https://www.ascent-dav.org/mirror/conduit/latest/
displayName: 'Spack Build Tpls'
- script: |
Expand Down
1 change: 1 addition & 0 deletions scripts/uberenv
Submodule uberenv added at b4ac7a

0 comments on commit eef02b3

Please sign in to comment.