Skip to content

Commit

Permalink
Re-enable JIT-enabled arm32 builds on nightlies (#1604)
Browse files Browse the repository at this point in the history
* Adjust AIX RAM limit down to aid JDK14 (#1555)

Signed-off-by: Stewart Addison <[email protected]>

* Revert "Go back to using non-JIT arm32 JDK8 so we can do a release (#1588)"

This reverts commit 01f365e.
  • Loading branch information
sxa555 authored Mar 16, 2020
1 parent 19f89cf commit 300db8f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion configureBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ setRepository() {
elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_CORRETTO}" ]]
then
suffix="corretto/corretto-${BUILD_CONFIG[OPENJDK_CORE_VERSION]:3}"
elif [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "armv7l" ]; then
suffix="adoptopenjdk/openjdk-aarch32-jdk8u";
else
suffix="adoptopenjdk/openjdk-${BUILD_CONFIG[OPENJDK_FOREST_NAME]}";
fi
Expand Down Expand Up @@ -236,7 +238,7 @@ processArgumentsforSpecificArchitectures() {

"armv7l")
if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && isHotSpot; then
jvm_variant=zero
jvm_variant=client
else
jvm_variant=server,client
fi
Expand Down

0 comments on commit 300db8f

Please sign in to comment.