From 5df071e71fb6cbda0ecbf648bfe67d22478cb281 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Wed, 13 Dec 2023 16:12:47 -0800 Subject: [PATCH] Update the script to fetch darwin x86 from jetbrains target Bug: 302395149 Test: run the script, follow up CL Change-Id: I2d3fff4270c3b6997c1e60646f4a3d573196c87b --- update.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 0271a6e..890ba27 100755 --- a/update.sh +++ b/update.sh @@ -10,6 +10,8 @@ BUILD_NUMBER="${1:?Specify build number}" LINUX_ZIP=/tmp/$$.linux.zip +DARWIN_ZIP=/tmp/$$.darwin.zip +DARWIN_ARM64_ZIP=/tmp/$$.darwin_arm64.zip FETCH_ARTIFACT=/google/data/ro/projects/android/fetch_artifact cd "$(dirname $0)" @@ -18,6 +20,7 @@ rm -rf staging mkdir -p staging $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 jdk.zip ${LINUX_ZIP} +$FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target darwin_jetbrainsruntime_next jdk.zip ${DARWIN_ZIP} $FETCH_ARTIFACT --bid ${BUILD_NUMBER} --disable_progressbar --target linux_openjdk21 manifest_${BUILD_NUMBER}.xml staging/manifest.xml rm -rf staging/linux-x86 @@ -25,7 +28,13 @@ mkdir -p staging/linux-x86 (cd staging/linux-x86; unzip -q ${LINUX_ZIP}) touch staging/linux-x86/MODULE_LICENSE_GPL -rm -f ${LINUX_ZIP} +rm -rf staging/darwin-x86 +mkdir staging/darwin-x86 +(cd staging/darwin-x86; unzip -q ${DARWIN_ZIP}) +touch staging/darwin-x86/MODULE_LICENSE_GPL +rm -rf staging/darwin-arm64 + +rm -f ${LINUX_ZIP} ${DARWIN_ZIP} # Copy the RBE toolchain inputs files from the previous version to the staging # directory. @@ -33,8 +42,8 @@ cp linux-x86/bin/*_remote_toolchain_inputs staging/linux-x86/bin version=$(staging/linux-x86/bin/java -version 2>&1 | grep "OpenJDK Runtime Environment" | sed -e 's/.*(\(.*\))/\1/') -rm -rf linux-x86 manifest.xml +rm -rf linux-x86 darwin-x86 manifest.xml mv staging/* . rmdir staging -git add linux-x86 manifest.xml +git add linux-x86 darwin-x86 manifest.xml git commit -m "Update to JDK $version" --edit