Macos related updates, mandrel_linux_build.sh from f1e209e

graalvm · Sep 23, 2024 · 054d5e1 · 054d5e1
1 parent d45317e
commit 054d5e1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jenkins/jobs/scripts/mandrel_linux_build.sh b/jenkins/jobs/scripts/mandrel_linux_build.sh
@@ -7,7 +7,11 @@ export JAVA_HOME=/usr/java/${OPENJDK}
 export MX_HOME=${WORKSPACE}/mx
 export PATH=${JAVA_HOME}/bin:${MX_HOME}:${PATH}
 pushd mandrel
-export JAVA_VERSION="$(java --version | sed -e 's/.*build \([^) ]*\)).*/\1/;t;d' )"
+if [[ "$(uname)" =~ "Darwin" ]]; then
+    export JAVA_VERSION="$(java --version | sed -n '2s/.*build \([^)]*\)).*/\1/p')"
+else
+    export JAVA_VERSION="$(java --version | sed -e 's/.*build \([^) ]*\)).*/\1/;t;d' )"
+fi
 popd
 ${JAVA_HOME}/bin/java -ea build.java --maven-local-repository ${MAVEN_REPO} \
 --mandrel-repo ${MANDREL_REPO} --mx-home ${MX_HOME} \
@@ -25,7 +29,7 @@ if [[ ! -e "${MANDREL_HOME}/bin/native-image" ]]; then
   echo "Cannot find native-image tool. Quitting..."
   exit 1
 fi
-export MANDREL_VERSION="$( ${MANDREL_HOME}/bin/native-image --version | cut -d ' ' -f 2 )"
+export MANDREL_VERSION="$( ${MANDREL_HOME}/bin/native-image --version | cut -d ' ' -f 2 | head -n1)"
 cat >./MANDREL.md <<EOL
 This is a dev build of Mandrel from https://github.com/graalvm/mandrel.
 Mandrel ${MANDREL_VERSION}