From 73cc61c389bbb3ae62313e544fd1564dd14a660c Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Tue, 13 Aug 2024 09:46:08 +0300 Subject: [PATCH] Update java in macOS x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android requires java 17 in Qt 6.8 and RTA needs java 17 into VMs to compile Qt examples. Task-number: QTQAINFRA-6492 Pick-to: 6.8 Change-Id: I873c188154c2eae2a9eebddb94279c41ca822576 Reviewed-by: Johanna Äijälä Reviewed-by: Ville-Pekka Karhu --- coin/provisioning/common/macos/java.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/java.sh b/coin/provisioning/common/macos/java.sh index 1429f82410b..829b94c61da 100755 --- a/coin/provisioning/common/macos/java.sh +++ b/coin/provisioning/common/macos/java.sh @@ -1,17 +1,20 @@ #!/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 set -ex +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + echo "Installing Java Development Kit" -version=11.0.12 -targetFile=jdk-${version}_osx-x64_bin.dmg +version=17.0.12 +targetFile=jdk-${version}_macos-x64_bin.dmg +expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb" url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux +# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac echo "Mounting $targetFile" sudo mkdir -p /Volumes/files @@ -19,6 +22,8 @@ sudo mount -o locallocks "$url" /Volumes/files sudo cp "/Volumes/files/$targetFile" /tmp sudo umount /Volumes/files +cd /tmp +VerifyHash "$targetFile" "$expectedHash" sudo hdiutil attach "/tmp/$targetFile" echo Installing JDK