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 Java in Linux targets

Browse Source 
Jenkins needs Java 17

Task-number: QTQAINFRA-6263
Change-Id: Ia6438ecadbf98dc2c27e4efc863133ab5bbb668c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Juho Lääkkö <juho.laakko@qt.io>
This commit is contained in:
Matti Paaso
2024-11-14 09:47:39 +02:00
parent 409ffc507b
commit 8e921c3ad6
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
View File

@@ -111,7 +111,7 @@ installPackages+=(libcurl4-openssl-dev)
installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-11-jdk)
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

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

@@ -137,8 +137,8 @@ installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-8-jdk)
#Java 11 for Android
installPackages+=(openjdk-11-jdk)
#Java 17 for Android
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

4
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
View File

@@ -139,8 +139,8 @@ installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(openjdk-8-jdk)
#Java 11 for Android
installPackages+=(openjdk-11-jdk)
#Java 17 for Android, needed by RTA
installPackages+=(openjdk-17-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
installPackages+=(libssl-dev)

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

@@ -66,6 +66,9 @@ sudo zypper -nq install make
# Tools to build Git
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)"
echo "GCC = $gccVersion" >> versions.txt

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

@@ -72,6 +72,9 @@ sudo zypper -nq install openssl-3
# Valgrind (Needed for testlib selftests)
sudo zypper -nq install valgrind-devel
# Java
sudo zypper -nq install java-17-openjdk
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt

2
coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh
View File

@@ -72,6 +72,8 @@ sudo zypper -nq install valgrind-devel
# cifs-utils, for mounting smb drive
sudo zypper -nq install cifs-utils
# Java
sudo zypper -nq install java-17-openjdk
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
echo "GCC = $gccVersion" >> versions.txt