lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2025-12-29 19:35:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change Java version to 17 on Linux arm

Browse Source 
Jenkins needs Java 17 to run agent on VM

Task-number: QTQAINFRA-6263
Change-Id: Ia2749a4812402df8b11f6388f8e6bc3b995d5e53
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 7a2a226e8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Matti Paaso
2024-11-06 14:01:45 +02:00
committed by Qt Cherry-pick Bot
parent 5f00935059
commit cb765fe3c1
2 changed files with 2 additions and 4 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

@@ -113,7 +113,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-24.04-aarch64/02-apt.sh
View File

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