Use graal 17 on aarch

theotherp · Jun 8, 2024 · 55f9be6 · 55f9be6
1 parent fe25fb1
commit 55f9be6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/misc/buildLinuxCore/amd64/buildInContainer.sh b/misc/buildLinuxCore/amd64/buildInContainer.sh
@@ -9,6 +9,6 @@ cd /nzbhydra2 || exit
 rm -rf core/target
 mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --batch-mode clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests -T 1C
 mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -pl org.nzbhydra:core -Pnative clean native:compile -DskipTests
-/upx-4.2.2-amd64_linux/upx -3 core/target/core
+/upx-4.2.4-amd64_linux/upx -3 core/target/core
 #Because docker is run as root the files are written to the host file system as root
 chmod o+rwx -R .
diff --git a/misc/buildLinuxCore/arm64/buildInContainer.sh b/misc/buildLinuxCore/arm64/buildInContainer.sh
@@ -8,6 +8,6 @@ cd /nzbhydra2 || exit
 rm -rf core/target
 mvn --batch-mode clean install -pl \!org.nzbhydra:linux-amd64-release,!org.nzbhydra:linux-arm64-release,\!org.nzbhydra:windows-release,\!org.nzbhydra:generic-release -DskipTests -T 1C
 mvn -pl org.nzbhydra:core -Pnative clean native:compile -DskipTests
-/upx-4.2.2-arm64_linux/upx -3 core/target/core
+/upx-4.2.4-arm64_linux/upx -3 core/target/core
 #Because docker is run as root the files are written to the host file system as root
 chmod o+rwx -R .
diff --git a/misc/buildLinuxCore/arm64/dockerfile b/misc/buildLinuxCore/arm64/dockerfile
@@ -4,25 +4,24 @@ FROM arm64v8/ubuntu:16.04
 RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker
 RUN echo 'APT::Install-Recommends "0";' >> /etc/apt/apt.conf.d/00-docker
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y zip unzip wget curl libfreetype6 libfreetype6-dev build-essential ca-certificates
-RUN wget -nv --no-check-certificate https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp
+RUN wget -nv --no-check-certificate https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.tar.gz -P /tmp
 
 RUN tar xf /tmp/apache-maven-*.tar.gz -C /opt
-RUN ln -s /opt/apache-maven-3.9.6 /opt/maven
+RUN ln -s /opt/apache-maven-3.9.5 /opt/maven
 ENV M2_HOME=/opt/maven
 ENV MAVEN_HOME=/opt/maven
 ENV PATH=${M2_HOME}/bin:${PATH}
 
-RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.1/graalvm-community-jdk-22.0.1_linux-aarch64_bin.tar.gz
-RUN tar xzf graalvm-community-jdk-22.0.1_linux-aarch64_bin.tar.gz -C /
-RUN rm graalvm-community-jdk-22.0.1_linux-aarch64_bin.tar.gz
-ENV PATH=/graalvm-community-openjdk-22.0.1+8.1/bin/:$PATH
-ENV JAVA_HOME=/graalvm-community-openjdk-22.0.1+8.1
+# Newer versions fail on aarch: https://github.com/oracle/graal/issues/7467
+RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz
+RUN tar xzf graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz -C /
+ENV PATH=/graalvm-community-openjdk-17.0.9+9.1/bin/:$PATH
+ENV JAVA_HOME=/graalvm-community-openjdk-17.0.9+9.1
 
 # When you update this also change the directory in buildInContainer.sh
 #Newer versions crash with segmentation fault: https://github.com/upx/upx/issues/737
 RUN wget -nv --no-check-certificate https://github.com/upx/upx/releases/download/v4.2.4/upx-4.2.4-arm64_linux.tar.xz
 RUN tar -xf upx-4.2.4-arm64_linux.tar.xz
-RUN rm upx-4.2.4-arm64_linux.tar.xz
 ENV PATH=/tmp/upx-4.2.4-arm64_linux/:$PATH
 
 ENV HYDRA_NATIVE_BUILD=true