Commit 0f5408de authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'superbuild-no-progress-ninja'

59654de6 ci: support older git for checking out ParaView
2d235b80 ci: update fetch_submodule to work for old git
c0cf7112 gitlab-ci: update to an image that has git in it
3357bc11 ci: use the CentOS-provided git package
eb9bb821

 superbuild: update to suppress progress for downloads with Ninja
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !791
parents 808a2c94 59654de6
......@@ -23,8 +23,18 @@ else
fi
readonly pv_branch
# The CentOS 7 containers have an old git that does not support this flag
# (added in 2.9.0).
shallow_submodules="--shallow-submodules"
if echo "$CI_JOB_NAME" | grep -q "build:linux"; then
shallow_submodules=""
fi
readonly shallow_submodules
# 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_PROJECT_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_PROJECT_DIR/source-paraview" describe
cd "$CI_PROJECT_DIR/source-paraview"
git describe
#git -C "$CI_PROJECT_DIR/source-paraview" describe
......@@ -13,9 +13,9 @@ yum install -y \
epel-release
# Install development tools
rpm -U https://centos7.iuscommunity.org/ius-release.rpm
yum install -y \
git2u
git-core \
git-lfs
# Install toolchains.
yum install -y \
......
......@@ -22,8 +22,17 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (res)
message(FATAL_ERROR
"Failed to get the remote url for the submodule: ${err}")
execute_process(
COMMAND "${GIT_COMMAND}" config --get remote.origin.url
OUTPUT_VARIABLE remote_url
RESULT_VARIABLE res
ERROR_VARIABLE err
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (res)
message(FATAL_ERROR
"Failed to get the remote url for the submodule: ${err}")
endif ()
endif ()
# Take the "directory" of the source project path and append the "filename" of
......
......@@ -9,7 +9,7 @@
# newer compilers.
.centos7:
image: "kitware/paraview:ci-superbuild-centos7-20201027"
image: "kitware/paraview:ci-superbuild-centos7-20201028"
variables:
GIT_SUBMODULE_STRATEGY: none
......
Subproject commit 2f992b8f9a22853230e58c685aa20664dc967d4a
Subproject commit a4358b096e6b616762ddadc5fdd8ae34ebdfc202
Supports Markdown
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