enable arm64 builds (#94)

* enable arm64 builds

* Add `[skip build-base]` conditional for PRs

* only setup arm64 arch in qemu

* fix permission java-tools

* go default to 1.20 and fix pwsh

* exclude lib32z1 for arm64

* increase npm timeout for qemu

* Try to speed up npm under qemu

* make npm verbose

* Use http registry

* Another test

* Use less build resources

* fix dockerhub tag

* Fix building
This commit is contained in:
ChristopherHX
2023-08-26 22:22:05 +02:00
committed by GitHub
parent 60cbcc9f33
commit 4f6bdf85e1
9 changed files with 228 additions and 136 deletions
+39 -23
View File
@@ -9,6 +9,31 @@
. /imagegeneration/installers/helpers/install.sh
. /imagegeneration/installers/helpers/etc-environment.sh
java_arch() {
case "$(uname -m)" in
'x86_64') echo 'amd64' ;;
'aarch64') echo 'arm64' ;;
esac
}
toolcache_arch() {
case "$(uname -m)" in
'aarch64') echo 'arm64' ;;
'x86_64') echo 'x64' ;;
'armv7l') echo 'armv7l' ;;
*) exit 1 ;;
esac
}
env_arch() {
case "$(uname -m)" in
'aarch64') echo 'ARM64' ;;
'x86_64') echo 'X64' ;;
'armv7l') echo 'ARMV7L' ;;
*) exit 1 ;;
esac
}
createJavaEnvironmentalVariable() {
local JAVA_VERSION=$1
local VENDOR_NAME=$2
@@ -17,10 +42,10 @@ createJavaEnvironmentalVariable() {
case ${VENDOR_NAME} in
"Adopt" )
INSTALL_PATH_PATTERN="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64" ;;
INSTALL_PATH_PATTERN="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-$(java_arch)" ;;
"Temurin-Hotspot" )
INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64" ;;
INSTALL_PATH_PATTERN="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-$(java_arch)" ;;
*)
echo "Unknown vendor"
exit 1
@@ -34,8 +59,8 @@ createJavaEnvironmentalVariable() {
update-java-alternatives -s ${INSTALL_PATH_PATTERN}
fi
echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}"
addEtcEnvironmentVariable JAVA_HOME_${JAVA_VERSION}_X64 ${INSTALL_PATH_PATTERN}
echo "Setting up JAVA_HOME_${JAVA_VERSION}_$(env_arch) variable to ${INSTALL_PATH_PATTERN}"
addEtcEnvironmentVariable "JAVA_HOME_${JAVA_VERSION}_$(env_arch)" ${INSTALL_PATH_PATTERN}
}
enableRepositories() {
@@ -67,10 +92,10 @@ installOpenJDK() {
# Install Java from PPA repositories.
if [[ ${VENDOR_NAME} == "Temurin-Hotspot" ]]; then
apt-get -y install temurin-${JAVA_VERSION}-jdk=\*
javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-amd64"
javaVersionPath="/usr/lib/jvm/temurin-${JAVA_VERSION}-jdk-$(java_arch)"
elif [[ ${VENDOR_NAME} == "Adopt" ]]; then
apt-get -y install adoptopenjdk-${JAVA_VERSION}-hotspot=\*
javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-amd64"
javaVersionPath="/usr/lib/jvm/adoptopenjdk-${JAVA_VERSION}-hotspot-$(java_arch)"
else
echo "${VENDOR_NAME} is invalid, valid names are: Temurin-Hotspot and Adopt"
exit 1
@@ -91,10 +116,10 @@ installOpenJDK() {
mkdir -p "${javaToolcacheVersionPath}"
# Create a complete file
touch "${javaToolcacheVersionPath}/x64.complete"
touch "${javaToolcacheVersionPath}/$(toolcache_arch).complete"
# Create symlink for Java
ln -s ${javaVersionPath} "${javaToolcacheVersionPath}/x64"
ln -s ${javaVersionPath} "${javaToolcacheVersionPath}/$(toolcache_arch)"
# add extra permissions to be able execute command without sudo
chmod -R 777 /usr/lib/jvm
@@ -107,25 +132,16 @@ enableRepositories
apt-get update
defaultVersion=$(get_toolset_value '.java.default')
defaultVendor=$(get_toolset_value '.java.default_vendor')
jdkVendors=($(get_toolset_value '.java.vendors[].name'))
jdkVendor="Temurin-Hotspot"
jdkVersionsToInstall=($(get_toolset_value ".java.versions[]"))
for jdkVendor in ${jdkVendors[@]}; do
for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
# get vendor-specific versions
jdkVersionsToInstall=($(get_toolset_value ".java.vendors[] | select (.name==\"${jdkVendor}\") | .versions[]"))
installOpenJDK ${jdkVersionToInstall} ${jdkVendor}
for jdkVersionToInstall in ${jdkVersionsToInstall[@]}; do
isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True
installOpenJDK ${jdkVersionToInstall} ${jdkVendor}
isDefaultVersion=False; [[ ${jdkVersionToInstall} == ${defaultVersion} ]] && isDefaultVersion=True
if [[ ${jdkVendor} == ${defaultVendor} ]]; then
createJavaEnvironmentalVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion}
fi
done
createJavaEnvironmentalVariable ${jdkVersionToInstall} ${jdkVendor} ${isDefaultVersion}
done
# Adopt 12 is only available for Ubuntu 18.04