Skip to content

Commit

Permalink
Merge pull request #1769 from DARMA-tasking/1768-fix-gitlab-ci
Browse files Browse the repository at this point in the history
#1768: CI: add test, try to fix clone error
  • Loading branch information
lifflander authored May 5, 2022
2 parents 890f606 + 2f0adfa commit 13a2c0d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,12 @@ nvcc_wrapper-vortex:
- source /projects/empire/installs/vortex/CUDA-10.1.243_GNU-7.3.1_SPMPI-ROLLING-RELEASE-CUDA-STATIC/trilinos/latest-link/load_matching_env.sh
- mkdir -p /tmp/$USER
- ci/build_cpp.sh $CI_PROJECT_DIR $CI_PROJECT_DIR/vt_build_nvcc_wrapper
- ci/test_cpp.sh $CI_PROJECT_DIR $CI_PROJECT_DIR/vt_build_nvcc_wrapper
only:
refs:
- develop
tags:
- ppc64le
- ppc64le


arm-stria:
Expand All @@ -53,8 +54,9 @@ arm-stria:
script:
- source /projects/empire/installs/stria/ARM-20.1_OPENMPI-4.0.5-RELEASE-OPENMP-STATIC/trilinos/latest-link/load_matching_env.sh
- ci/build_cpp.sh $CI_PROJECT_DIR $CI_PROJECT_DIR/vt_build_gcc
- ci/test_cpp.sh $CI_PROJECT_DIR $CI_PROJECT_DIR/vt_build_gcc
only:
refs:
- develop
tags:
- aarch64
- aarch64
8 changes: 4 additions & 4 deletions ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ else
if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1
then
cd "${source_dir}/lib"
git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git
git clone -b "${detector_rev}" --depth 1 git@github.com:DARMA-tasking/detector.git
cd -
else
git clone -b "${detector_rev}" --depth 1 https://github.com/DARMA-tasking/detector.git
git clone -b "${detector_rev}" --depth 1 git@github.com:DARMA-tasking/detector.git
export DETECTOR=$PWD/detector
export DETECTOR_BUILD=${build_dir}/detector
mkdir -p "$DETECTOR_BUILD"
Expand All @@ -73,10 +73,10 @@ else
if test "${VT_DOXYGEN_ENABLED:-0}" -eq 1
then
cd "${source_dir}/lib"
git clone -b "${checkpoint_rev}" --depth 1 https://github.com/DARMA-tasking/checkpoint.git
git clone -b "${checkpoint_rev}" --depth 1 git@github.com:DARMA-tasking/checkpoint.git
cd -
else
git clone -b "${checkpoint_rev}" --depth 1 https://github.com/DARMA-tasking/checkpoint.git
git clone -b "${checkpoint_rev}" --depth 1 git@github.com:DARMA-tasking/checkpoint.git
export CHECKPOINT=$PWD/checkpoint
export CHECKPOINT_BUILD=${build_dir}/checkpoint
mkdir -p "$CHECKPOINT_BUILD"
Expand Down

0 comments on commit 13a2c0d

Please sign in to comment.