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

Merge topic 'ci-sync-with-master' into release

569e1ebf ci: exclude pvweb tests
e1b3599c ci: suppress szip output
0e27da84 ci: update fetch_submodule.cmake
a42a3b80 ci: update to CMake 3.19.4
f8c24cb6

 ci: update CDash group listing
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !854
parents dbafe4b4 569e1ebf
{
"latest-release-packages": [
{
"group": "release-packages",
"site": "gitlab-ci",
"buildname": "[linux_plain]"
},
{
"group": "release-packages",
"site": "gitlab-ci",
......
$erroractionpreference = "stop"
$version = "3.17.3"
$sha256sum = "8A02DE221AA96C236A947B28CA1BD6327B9BB82FA74B91E5CAA49FFD6A642AE2"
$version = "3.19.4"
$sha256sum = "24B03DAF75CE59B542DA38C829FE6944D3BF7CF99AFAA8225CF29F7876823899"
$filename = "cmake-$version-win64-x64"
$tarball = "$filename.zip"
......
......@@ -2,18 +2,20 @@
set -e
readonly version="3.17.4"
readonly version="3.19.4"
case "$( uname -s )" in
Linux)
shatool="sha256sum"
sha256sum="126cc8356907913787d4ff35237ae1854c09b927a35dbe5270dd571ae224bdd3"
sha256sum="ff23e1f53c53e8ef1fa87568345031d86c504e53efb52fa487db0b8e0ee4d3ff"
platform="Linux"
arch="x86_64"
;;
Darwin)
shatool="shasum -a 256"
sha256sum="125eaf2befeb8099237298424c6e382b40cb23353ee26ce96545db29ed899b4a"
platform="Darwin"
sha256sum="eb1f52996632c1e71a1051c9e2c30cc8df869fb5a213b1a0d3b202744c6c5758"
platform="macos"
arch="universal"
;;
*)
echo "Unrecognized platform $( uname -s )"
......@@ -23,8 +25,9 @@ esac
readonly shatool
readonly sha256sum
readonly platform
readonly arch
readonly filename="cmake-$version-$platform-x86_64"
readonly filename="cmake-$version-$platform-$arch"
readonly tarball="$filename.tar.gz"
cd .gitlab
......
......@@ -74,6 +74,7 @@ set(SUPPRESS_pythonzopeinterface_OUTPUT ON CACHE BOOL "")
set(SUPPRESS_qt5_OUTPUT ON CACHE BOOL "")
set(SUPPRESS_scipy_OUTPUT ON CACHE BOOL "")
set(SUPPRESS_silo_OUTPUT ON CACHE BOOL "")
set(SUPPRESS_szip_OUTPUT ON CACHE BOOL "")
set(paraview_SOURCE_SELECTION "source" CACHE STRING "")
file(TO_CMAKE_PATH "$ENV{CI_PROJECT_DIR}/source-paraview" paraview_source_dir)
......
......@@ -14,6 +14,9 @@ set(test_exclusions
"cpack-"
# https://gitlab.kitware.com/paraview/paraview/-/issues/20061
"paraview-pvweb-visualizer"
# Waiting for https://gitlab.kitware.com/paraview/paraview-superbuild/-/merge_requests/842
"pvweb"
)
string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
if (test_exclusions)
......
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 3.8)
# Find Git.
find_program(GIT_COMMAND NAMES git git.cmd)
execute_process(
COMMAND "${GIT_COMMAND}" submodule update --init --recursive
OUTPUT_VARIABLE init_submodules
RESULT_VARIABLE res
ERROR_VARIABLE err
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Ignore the error; we just want to make sure the submodules are present.
# Check if we're in a merge request (nothing should be needed if not).
if ("$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
return ()
endif ()
# Find Git.
find_program(GIT_COMMAND NAMES git git.cmd)
if (NOT GIT_COMMAND)
message(FATAL_ERROR
"`git` was not found.")
......
......@@ -84,7 +84,6 @@
- export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH
- cmake --version
- ninja --version
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
......@@ -63,7 +63,6 @@
# Download Qt
- cmake -P .gitlab/ci/download_qt.cmake
- export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
......@@ -74,7 +74,6 @@
- cmake --version
- ninja --version
# Support submodule references to the user's fork.
- git submodule update --init --recursive
- git submodule foreach --recursive cmake -P "$pwdpath/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
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