Commit 6161879d authored by Ben Boeckel's avatar Ben Boeckel
Browse files

ci: clone paraview underneath the source tree

This avoids having to remove the path manually.
parent 284ae0ab
......@@ -23,11 +23,8 @@ else
fi
readonly pv_branch
# since we do shallow clones, we need to cleanup old checkouts
rm -rf "$CI_BUILDS_DIR/source-paraview"
# full clone of paraview with shallow-submodule. full clone needed so that `git describe` works correctly
git clone --recursive --shallow-submodules -b "$pv_branch" "$url" "$CI_BUILDS_DIR/source-paraview"
git clone --recursive --shallow-submodules -b "$pv_branch" "$url" "$CI_PROJECT_DIR/source-paraview"
# let's print ParaView version for reference even when the artifacts disappear
git -C "$CI_BUILDS_DIR/source-paraview describe"
git -C "$CI_PROJECT_DIR/source-paraview" describe
......@@ -64,7 +64,7 @@ set(SUPPRESS_qt5_OUTPUT ON CACHE BOOL "")
set(SUPPRESS_scipy_OUTPUT ON CACHE BOOL "")
set(paraview_SOURCE_SELECTION "source" CACHE STRING "")
file(TO_CMAKE_PATH "$ENV{CI_BUILDS_DIR}/source-paraview" paraview_source_dir)
file(TO_CMAKE_PATH "$ENV{CI_PROJECT_DIR}/source-paraview" paraview_source_dir)
set(paraview_SOURCE_DIR "${paraview_source_dir}" CACHE PATH "")
# Default to Release builds.
......
......@@ -90,8 +90,8 @@
.before_script_linux_paraview: &before_script_linux_paraview
- .gitlab/ci/checkout_paraview.sh
- export PARAVIEW_COMMIT_SHA=`git -C $CI_BUILDS_DIR/source-paraview rev-parse HEAD`
- export PARAVIEW_COMMIT_SHORT_SHA=`git -C $CI_BUILDS_DIR/source-paraview rev-parse --short HEAD`
- export PARAVIEW_COMMIT_SHA=`git -C $CI_PROJECT_DIR/source-paraview rev-parse HEAD`
- export PARAVIEW_COMMIT_SHORT_SHA=`git -C $CI_PROJECT_DIR/source-paraview rev-parse --short HEAD`
.cmake_build_linux:
stage: build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment