mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-18 02:06:20 +08:00
Update Git version
We need newer ssh for RTA use. Current version has problem with ConnectTimeout: https://github.com/PowerShell/Win32-OpenSSH/issues/1352 Latest git version comes with OpenSSH version 9.0p1 from which this should be fixed. Pick-to: 6.4 6.3 6.2 5.15 Task-number: QTQAINFRA-5038 Change-Id: I5aac1db22b1145163ee947537b363a94b86d094d Reviewed-by: Timo Lahti <timo.lahti@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
@@ -42,17 +42,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="2.31.1"
|
||||
version="2.36.1"
|
||||
officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
|
||||
cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
|
||||
targetFile="/tmp/git-$version.tar.gz"
|
||||
sha="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
|
||||
sha="a17c11da2968f280a13832d97f48e9039edac354"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
sourceDir="/tmp/git-$version-source"
|
||||
mkdir $sourceDir
|
||||
tar -xzf "$targetFile" -C $sourceDir
|
||||
|
||||
cd "$sourceDir/git-2.31.1"
|
||||
cd "$sourceDir/git-$version"
|
||||
installDir="$HOME/git"
|
||||
make configure
|
||||
./configure --prefix=$installDir
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -38,15 +38,15 @@
|
||||
#############################################################################
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# Install Git version 2.31.0
|
||||
# Install Git
|
||||
|
||||
$version = "2.31.0"
|
||||
$version = "2.36.1"
|
||||
if (Is64BitWinHost) {
|
||||
$arch = "-64-bit"
|
||||
$sha1 = "495d78f8d961e030944d9cb53af80d909d493c3f"
|
||||
$sha1 = "594bdfc4e7704fb03fe14b7c0613087dfa3d4416"
|
||||
} else {
|
||||
$arch = "-32-bit"
|
||||
$sha1 = "e57c040aea297b363aefaf26424f2e7a84a4a173"
|
||||
$sha1 = "1bbe040254c236607ccb84e14a3f608b1a4e959a"
|
||||
}
|
||||
$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
|
||||
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"
|
||||
|
||||
Reference in New Issue
Block a user