Skip to content

Commit

Permalink
Remaining changes
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienbernede committed Jun 23, 2022
1 parent fac3943 commit 1ba6a0d
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "cmake/blt"]
path = cmake/blt
url = https://github.com/LLNL/blt.git
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
# SPDX-License-Identifier: (MIT)
################################################################################

cmake_minimum_required(VERSION 3.8)
project( radiuss-spack-testing )

################################
# CONFIG
################################
Expand Down
1 change: 1 addition & 0 deletions cmake/blt
Submodule blt added at 49971b
4 changes: 2 additions & 2 deletions docs/sphinx/structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ Structure
=========

There are two main parts in this projects:
- The gitlab CI configuration, consisting of YAML files. The parent file is
* The gitlab CI configuration, consisting of YAML files. The parent file is
``.gitlab-ci.yml`` and points to sub-parts in ``.gitlab`` using local
``includes``.
- The spack environments, each one defined in a subdirectory of
* The spack environments, each one defined in a subdirectory of
``spack-environments``.


Expand Down
22 changes: 10 additions & 12 deletions scripts/get-spack
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@ if [[ ! -d ${SPACK_PATH} ]]
then
mkdir -p ${SPACK_PATH}/..
# A shallow clone is enough, and much faster.
git clone ${SPACK_REPO} --depth 1 --branch ${SPACK_REF} ${SPACK_PATH}
# We tag the commit so we can retrieve which one was used by a given pipeline.
git tag ${CI_PIPELINE_ID}
else
cd ${SPACK_PATH}
git checkout -b temp
git branch -D ${SPACK_REF}
git fetch --depth 1 ${SPACK_REPO} ${SPACK_REF}:${SPACK_REF}
git checkout ${SPACK_REF}
git tag ${CI_PIPELINE_ID}
git branch -D temp
cd -
git clone ${SPACK_REPO} --depth 1 --branch develop ${SPACK_PATH}
fi

cd ${SPACK_PATH}
git checkout -b temp
git branch -D ${SPACK_REF}
git fetch --depth 1 ${SPACK_REPO} ${SPACK_REF}:${SPACK_REF}
git checkout ${SPACK_REF}
git tag ${CI_PIPELINE_ID}
git branch -D temp
cd -
#[--get-spack]

0 comments on commit 1ba6a0d

Please sign in to comment.