Update git

Older git version does not allow fetching single specific sha1.

Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a2393b588287fed91d61ff9b69a887f879b16748)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

19 files changed, 152 insertions, 0 deletions

diff --git a/coin/provisioning/common/linux/install-git.sh b/coin/provisioning/common/linux/install-git.sh
new file mode 100755
index 00000000..b0b01c84
--- /dev/null
+++ b/coin/provisioning/common/linux/install-git.sh
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install git from sources.
+# Requires GCC and Perl to be in PATH.
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="2.31.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"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+sourceDir="/tmp/git-$version-source"
+mkdir $sourceDir
+tar -xzf "$targetFile" -C $sourceDir
+
+cd "$sourceDir/git-2.31.1"
+installDir="$HOME/git"
+make configure
+./configure --prefix=$installDir
+make all
+sudo make install
+
+SetEnvVar "PATH" "\"$installDir/bin:\$PATH\""
+
+$installDir/bin/git --version
diff --git a/coin/provisioning/common/macos/install-git.sh b/coin/provisioning/common/macos/install-git.sh
new file mode 100755
index 00000000..6e3eba63
--- /dev/null
+++ b/coin/provisioning/common/macos/install-git.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+brew install git
diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
index c3c44ae7..3f8714a5 100755
--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
@@ -45,6 +45,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
index 17ce3b87..80fefb5c 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -45,6 +45,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
index 17ce3b87..80fefb5c 100755
--- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
@@ -45,6 +45,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
index 14902653..033f5671 100755
--- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
@@ -112,6 +112,9 @@ sudo zypper -nq update open-vm-tools
 # RTA tests requires python 2 xml modules
 sudo zypper -nq install python-xml
 
+# Tools to build Git
+sudo zypper -nq install autoconf libcurl-devel libexpat-devel
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 
diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
index 12170828..abaf2ee3 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -127,6 +127,7 @@ installPackages+=(libgl1-mesa-glx)
 installPackages+=(libgl1-mesa-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
index 28cd31e4..1df708bf 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -144,6 +144,7 @@ installPackages+=(libegl-dev)
 installPackages+=(libglvnd-dev)
 installPackages+=(libgles2-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
index 9c81732d..982faecf 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
@@ -55,6 +55,9 @@ sudo zypper -nq install libspeechd-devel
 # make
 sudo zypper -nq install make
 
+# Tools to build Git
+sudo zypper -nq install autoconf libcurl-devel libexpat-devel
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh
new file mode 100755
index 00000000..05fcdf8e
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"
diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh
new file mode 100755
index 00000000..ea4d3c44
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"
diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh
new file mode 100755
index 00000000..ea4d3c44
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"
diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh
new file mode 100755
index 00000000..ea4d3c44
--- /dev/null
+++ b/coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"