From 2f0adfabe82394994e64081cf33c8b570a63ca4e Mon Sep 17 00:00:00 2001 From: Jonathan Lifflander Date: Thu, 5 May 2022 09:41:02 -0700 Subject: [PATCH] #1768: CI: add test, try to fix clone error --- .gitlab-ci.yml | 6 ++++-- ci/build_cpp.sh | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 405c0d3647..f753517fa8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: @@ -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 diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 0b928308b6..b5756dcebb 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -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" @@ -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"