From dff15e0a716caf5510521daa9e9f0df4c17f9cad Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 25 Sep 2020 15:19:13 +0300 Subject: Provisioning: Add system GCC versions to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently GCC versions which comes with the system are missing from versions.txt. This change will add those Task-number: QTQAINFRA-3933 Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 4 ++++ coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 5 ++++- .../qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index 2056df70..b6031253 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -151,3 +151,7 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 8138a638..5b21a0c0 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -108,3 +108,6 @@ sudo zypper -nq install java # open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. sudo zypper -nq update open-vm-tools + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index 8f80518d..b2923386 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -51,3 +51,5 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt -- cgit v1.2.3