mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-06 23:16:54 +08:00
Linux: Add GCC versions visible in versions.txt
Currently only SLES and openSUSE has GCC in versions.txt. Will also make GCC versions visible in Tools and Versions pages. Task-number: QTQAINFRA-5901 Pick-to: 6.5 Change-Id: I9742c3151e074c503947018a0c7f7c2e0c1077bd Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit5f627786ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit207ba9b605) Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
@@ -179,6 +179,9 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requi
|
||||
sudo /usr/bin/pip3 install wheel
|
||||
sudo /usr/bin/pip3 install dataclasses
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
|
||||
@@ -142,5 +142,8 @@ sudo pip3 install virtualenv wheel
|
||||
|
||||
sudo /usr/bin/pip3 install wheel
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -154,5 +154,8 @@ sudo python3.8 -m pip install virtualenv wheel
|
||||
|
||||
sudo /usr/bin/pip3 install wheel
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -164,5 +164,8 @@ sudo python3.8 -m pip install virtualenv wheel
|
||||
sudo /usr/bin/pip3 install wheel
|
||||
sudo /usr/bin/pip3 install dataclasses
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -179,6 +179,9 @@ sudo /usr/bin/pip3 install wheel
|
||||
sudo /usr/bin/pip3 install dataclasses
|
||||
# No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
|
||||
@@ -168,5 +168,8 @@ sudo /usr/bin/pip3 install wheel
|
||||
# Make FindPython3.cmake to find python3
|
||||
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -198,6 +198,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
|
||||
# Make FindPython3.cmake to find python3
|
||||
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
|
||||
@@ -202,6 +202,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
|
||||
# Make FindPython3.cmake to find python3
|
||||
sudo ln -s /usr/bin/python3 /usr/local/bin/python3
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
|
||||
@@ -99,5 +99,5 @@ sudo zypper -nq install nodejs16
|
||||
# OpenSSL 3
|
||||
sudo zypper -nq install openssl-3
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
@@ -110,7 +110,7 @@ sudo zypper -nq install cifs-utils
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
sudo zypper -nq install perl-JSON
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
|
||||
|
||||
@@ -63,6 +63,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
# SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
|
||||
@@ -261,5 +261,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -258,5 +258,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -263,5 +263,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
|
||||
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
|
||||
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -69,7 +69,7 @@ sudo zypper -nq install autoconf libcurl-devel libexpat-devel
|
||||
# Java
|
||||
sudo zypper -nq install java-17-openjdk
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
|
||||
@@ -75,7 +75,7 @@ sudo zypper -nq install valgrind-devel
|
||||
# Java
|
||||
sudo zypper -nq install java-17-openjdk
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
|
||||
|
||||
@@ -84,7 +84,7 @@ sudo zypper -nq install java-17-openjdk
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
sudo zypper -nq install perl-JSON
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
|
||||
|
||||
Reference in New Issue
Block a user