mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 04:16:39 +08:00
CMake: Update provisioned CMake to version 3.30.5
Fixes: QTQAINFRA-6484
Change-Id: Iacccb9f43059c78080e338da6680f5c50284c057
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 400776459b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
419f19563d
commit
b87098e90d
@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
majorminorversion="3.27"
|
||||
version="3.27.7"
|
||||
majorminorversion="3.30"
|
||||
version="3.30.5"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
|
||||
SHA1="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f"
|
||||
SHA1="61b339cac5f110d5ed2934f66a26c2e991945e01"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-linux-x86_64"
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
majorminorversion="3.27.7"
|
||||
version="3.27.7"
|
||||
majorminorversion="3.30.5"
|
||||
version="3.30.5"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
|
||||
SHA1="75153b6c7a418bc7120c6217d4698c7d245d00e0"
|
||||
SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f"
|
||||
appPrefix="cmake-$version-macos-universal"
|
||||
|
||||
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
|
||||
|
||||
@@ -3,22 +3,22 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$majorminorversion = "3.27"
|
||||
$version = "3.27.7"
|
||||
$majorminorversion = "3.30"
|
||||
$version = "3.30.5"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
Write-Host "Installing CMake for architecture $cpu_arch"
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$arch = "arm64"
|
||||
$sha1 = "52ee08671dcb478c5ec6e862f41717f65047c598"
|
||||
$majorminorversion = "3.29"
|
||||
$version = "3.29.2"
|
||||
$sha1 = "408977a174476407bd660604f110a26ba41a6efd"
|
||||
$majorminorversion = "3.30"
|
||||
$version = "3.30.5"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$arch = "i386"
|
||||
$sha1 = "b6147215a5f9cd1138b012265229fbf2224d02c6"
|
||||
$sha1 = "d0636735c2d13a4443662605cd80c708f265eacc"
|
||||
}
|
||||
default {
|
||||
throw "Unknown architecture $cpu_arch"
|
||||
|
||||
Reference in New Issue
Block a user