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

Update Java version into 17

Browse Source 
Jenkins needs version 17 to get agent running in VM

Task-number: QTQAINFRA-6263
Pick-to: 6.5 6.2
Change-Id: I57daadad6baa2e7e538874769af3fbe0cdd42878
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 5128df0130)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Matti Paaso
2024-11-06 13:48:16 +02:00
committed by Qt Cherry-pick Bot
parent ad1e94d511
commit 5f00935059
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright (C) 2021 The Qt Company Ltd.
# Copyright (C) 2024 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
# This script installs JDK
@@ -8,10 +8,10 @@ set -ex
echo "Installing Java Development Kit"
targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-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/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target /
cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
echo "Unmounting $targetFile"
sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force
sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
echo "Disable auto update"
sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
echo "JDK Version = 15.0.2" >> ~/versions.txt
echo "JDK Version = 17.0.13" >> ~/versions.txt