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

Coin: Update JDK to 21 LTS

Browse Source 
Update Coin to use JDK 21.0.9 LTS:
-macOS 21.0.9
-macOS ARM 21.0.9
-OpenSUSE 16 21.0.9.0-160000.1.1
-OpenSUSE 15.x 21.0.9.0-156000.3.18.2
-RHEL 8.x and 9.x 21.0.9.0.10-1.el9
-SLES 15 21.0.9.0-150600.3.18.2
-Ubuntu 22.04, 22.04 and 24.04 21
-Windows 21.0.9

Task-number: QTBUG-130516
Task-number: QTBUG-130497
Pick-to: 6.11
Change-Id: Ie4d2706b15000b5cbd71991abb4c840027ef2c82
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Rami Potinkara
2024-10-23 22:46:55 +03:00
parent 80d65734af
commit d0c5982795
22 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coin/provisioning/common/macos/java_arm.sh
View File

@@ -8,10 +8,10 @@ set -ex
echo "Installing Java Development Kit"
targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
targetFile=zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg
url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
# url_alt=https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg
echo "Mounting $targetFile"
sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
sudo hdiutil attach "/tmp/$targetFile"
echo Installing JDK
cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
cd /Volumes/Azul\ Zulu\ JDK\ 21.46+19 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 21.pkg -target /
echo "Unmounting $targetFile"
sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 21.46+19 -force
echo "Disable auto update"
sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
echo "JDK Version = 17.0.13" >> ~/versions.txt
echo "JDK Version = 21.0.9" >> ~/versions.txt