lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update git

Browse Source 
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 a2393b5882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Toni Saario
2021-04-15 11:11:38 +03:00
committed by Qt Cherry-pick Bot
parent 3a7099ce84
commit 5c95c956be
19 changed files with 152 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
coin/provisioning/common/linux/install-git.sh Executable file
View File

@@ -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

5
coin/provisioning/common/macos/install-git.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -ex
brew install git

5
coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh
View File

@@ -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)

6
coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

5
coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
View File

@@ -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)

6
coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

5
coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh
View File

@@ -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)

6
coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

3
coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-zypperpackages.sh
View File

@@ -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

6
coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
View File

@@ -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)

6
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

1
coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
View File

@@ -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)

6
coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

3
coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
View File

@@ -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

6
coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/linux/install-git.sh"

6
coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/macos/install-git.sh"

6
coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/macos/install-git.sh"

6
coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/macos/install-git.sh"