Commit 796f253e authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'ci-config-sync'

b7350bc1 gitlab-ci: avoid collisions with other projects' sccache servers
30b05726 ci: update Qt to 5.15.1
e8e984a4 ci: update CMake to 3.18.4
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !765
parents 831effa5 b7350bc1
Pipeline #198547 failed with stages
$erroractionpreference = "stop"
$version = "3.17.3"
$sha256sum = "8A02DE221AA96C236A947B28CA1BD6327B9BB82FA74B91E5CAA49FFD6A642AE2"
$version = "3.18.4"
$sha256sum = "A932BC0C8EE79F1003204466C525B38A840424D4AE29F9E5FB88959116F2407D"
$filename = "cmake-$version-win64-x64"
$tarball = "$filename.zip"
......
......@@ -2,17 +2,17 @@
set -e
readonly version="3.17.3"
readonly version="3.18.4"
case "$( uname -s )" in
Linux)
shatool="sha256sum"
sha256sum="da8093956f0b4ae30293c9db498da9bdeaeea4e7a2b1f2d1637ddda064d06dd0"
sha256sum="149e0cee002e59e0bb84543cf3cb099f108c08390392605e944daeb6594cbc29"
platform="Linux"
;;
Darwin)
shatool="shasum -a 256"
sha256sum="2ad1413510681b041ec305923c6ccbc64b0fed6608df82f5543577f7b4b88305"
sha256sum="9d27049660474cf134ab46fa0e0db771b263313fcb8ba82ee8b2d1a1a62f8f20"
platform="Darwin"
;;
*)
......
......@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12)
# Input variables.
set(qt_version_major "5")
set(qt_version_minor "15")
set(qt_version_patch "0")
set(qt_version_patch "1")
# This URL is only visible inside of Kitware's network. Please use your own Qt
# Account to obtain these files.
set(qt_url_root "https://paraview.org/files/dependencies/internal/qt")
......@@ -16,7 +16,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2015")
elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR
"$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019")
set(qt_platform "windows_x86")
set(msvc_year "2017")
set(msvc_year "2019")
set(qt_abi "win64_msvc${msvc_year}_64")
elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "macos")
set(qt_platform "mac_x64")
......@@ -33,14 +33,7 @@ set(qt_version_nodot "${qt_version_major}${qt_version_minor}${qt_version_patch}"
# Files needed to download.
set(qt_files)
if (qt_platform STREQUAL "windows_x86")
if (msvc_year STREQUAL "2017")
set(qt_build_stamp "202002260536")
elseif (msvc_year STREQUAL "2015")
set(qt_build_stamp "202005150700")
else ()
message(FATAL_ERROR
"Build stamp for MSVC ${msvc_year} is unknown")
endif ()
set(qt_build_stamp "202009071110")
set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}")
list(APPEND qt_files
......@@ -54,7 +47,7 @@ if (qt_platform STREQUAL "windows_x86")
set(qt_subdir "${qt_version}/msvc${msvc_year}_64")
elseif (qt_platform STREQUAL "mac_x64")
set(qt_build_stamp "202005140805")
set(qt_build_stamp "202009071110")
set(qt_file_name_prefix "${qt_version}-0-${qt_build_stamp}")
foreach (qt_component IN ITEMS qtbase qtsvg qttools qtxmlpatterns)
......
......@@ -2,21 +2,25 @@
#
# sha256sum $files | awk '{ print "set(\"" $2 "_hash\" " $1 ")" }' >> $thisfile
set("5.15.0-0-202002260536d3dcompiler_47-x64.7z_hash" 428a8b5d74b31d42a234d9ddc05a1f13f9a651b0798094215b25263108983a95)
set("5.15.0-0-202002260536opengl32sw-64-mesa_12_0_rc2.7z_hash" dd40f61374ba988afabcb239713a10504816d7afc2997707c7ebcbe57eb30112)
set("5.15.0-0-202002260536qtbase-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" c041596be8f7a16c7be9ea6757c14766ff3200ab6d56f7db8f865dbfe039fe20)
set("5.15.0-0-202002260536qtsvg-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" 5c29598c8b9251536a9a2679dbabce20628c6cd51a66d9fe9d68ddbe0c69c172)
set("5.15.0-0-202002260536qttools-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" ba02878360ca11c90b7c7581a673383a698d17f771d672070af9330b6b789586)
set("5.15.0-0-202002260536qtxmlpatterns-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64.7z_hash" 56abd417c82d3f1327b8f60d1a7bccdfd1d34c3fea110a91d9d13d7e01fb76e3)
if (msvc_year STREQUAL "2015")
set("5.15.1-0-202009071110d3dcompiler_47-x64.7z_hash" a55cb8e4ef0a8271fd9937ca5d6305aa3994b178c675f4f39ecf0ee85b027d9d)
set("5.15.1-0-202009071110opengl32sw-64-mesa_12_0_rc2.7z_hash" 3408f3bc754a51835171ace18be3b0b71a5384c29f03917daef59b939e11a728)
else ()
set("5.15.1-0-202009071110d3dcompiler_47-x64.7z_hash" 76defcbef78e29832a5fca39607deac58419d49963fda3d1d61fd5a76c5de78b)
set("5.15.1-0-202009071110opengl32sw-64-mesa_12_0_rc2.7z_hash" f4697dbe90fd5302a48558e22f4c9ce657d93c00247c24a1edb6d425303a0d80)
endif ()
set("5.15.0-0-202005150700d3dcompiler_47-x64.7z_hash" 45b4c38886ef42368b62bdb9cec2e06fc3a68bc94696fdf2f83c9bdf29b0161f)
set("5.15.0-0-202005150700opengl32sw-64-mesa_12_0_rc2.7z_hash" 2f94c5315fccfa51bc547dc5eec7612dbc0646f12e4511bbc81f921066a1c245)
set("5.15.0-0-202005150700qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 0c2653c5eca256f59c0b48b537cd633b05560e4241c0226856d2ae22ab066df4)
set("5.15.0-0-202005150700qtsvg-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 12a32da7bbca6d1adc8702088205ca96b806337ee7e6a134658c592754b6b468)
set("5.15.0-0-202005150700qttools-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 976d87ede6d03cd0ebd025e5769cf9ce76c625fa2e19de6ea5f9e74d8f11cafd)
set("5.15.0-0-202005150700qtxmlpatterns-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 50e7e7c4c6ad558037bb6561406bca47d16ad56bfbd16219325006a628cc7f14)
set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 5d0d2e71e3b00cf88ac4c616b4b314a7e73871f325512821f53c464cdfee961f)
set("5.15.1-0-202009071110qtsvg-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 427e891531f775541b38f7fca3cdcb281af9ad4ef82b1b483a802b5ed211ea38)
set("5.15.1-0-202009071110qttools-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" 393630ea20cc5fa29e7987df21526586bcac23c3499fb9889d980758942f942e)
set("5.15.1-0-202009071110qtxmlpatterns-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z_hash" fc8c0b5776dee01fee943d13154400806acaef84d5b90ad682e3dcae967106ea)
set("5.15.0-0-202005140805qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 04d867c81d2431f288c42c9752642759460b9468477de349368dcc8de0c8ddc4)
set("5.15.0-0-202005140805qtsvg-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 578fab3a9b5fd945f30f3d82bdbe8203a904fe4a215fef82997d431680cb3f8f)
set("5.15.0-0-202005140805qttools-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 1858dae8848bc93f943a17b76a45ec3fe0e8c3be41b6ce7f46cdff14addbae78)
set("5.15.0-0-202005140805qtxmlpatterns-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" e083217bd03129d8524c5c3b7d98c2048c6c119f1ba3965fff147357f8e3d7d8)
set("5.15.1-0-202009071110qtbase-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" a5635124a135f383d9fb92bf628b018cff9f781addfd388926a367cda5b7cd38)
set("5.15.1-0-202009071110qtsvg-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" 9f344dafb9d00fadef4801a89e2e9d6f1599c8b25d3afd290a6c42f73ea16ed1)
set("5.15.1-0-202009071110qttools-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" 45b3debfc317f875d327e4506c0d211dc82ec92c1e9aa60e17b1a747ada22811)
set("5.15.1-0-202009071110qtxmlpatterns-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z_hash" dffcaf8a2028adb6621eb86ade6aa0bc8daa8961653a4a82841091b5165040ca)
set("5.15.1-0-202009071110qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" df2813ce7c6cb4287abd7956cd1cb9d08312e4ac1208b6cb57af4df11b8ebba1)
set("5.15.1-0-202009071110qtsvg-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 5e624dd519dc67ef80ea60f83162dd49e9a0e912122ad049a0a83af914a97ea2)
set("5.15.1-0-202009071110qttools-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" 94c5e98afa548bf56c7ccc29bccf727b75e2e90df98e83d22575d07f64359cda)
set("5.15.1-0-202009071110qtxmlpatterns-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z_hash" fe01c55dfb073064fe24e1e77564951ccfa21042b91ff8bd3d629854d0b8a7b7)
......@@ -9,6 +9,8 @@
# TODO: Factor this out so that each job selects the Xcode version to
# use so that different versions can be tested in a single pipeline.
DEVELOPER_DIR: "/Applications/Xcode-11.5.app/Contents/Developer"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4231
### Build and test
......
......@@ -6,6 +6,8 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmb-ci-ext\\$CI_CONCURRENT_ID"
# Avoid conflicting with other projects running on the same machine.
SCCACHE_SERVER_PORT: 4231
### Build and test
......
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