aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/release.yml1
-rwxr-xr-xsetup/package.sh21
2 files changed, 3 insertions, 19 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index db9283142..8f45acd84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,7 +44,6 @@ jobs:
wget -q http://files.jrsoftware.org/is/5/isetup-5.5.6.exe
wget -q https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13/OpenJDK21U-jdk_x64_windows_hotspot_21.0.2_13.zip
wget -q https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz
- wget -q https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13/OpenJDK21U-jdk_arm_linux_hotspot_21.0.2_13.tar.gz
wget -q https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2+13/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.2_13.tar.gz
./package.sh ${{ github.event.inputs.version }}
- name: Upload installers
diff --git a/setup/package.sh b/setup/package.sh
index 533015475..5b3c9bcde 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -15,7 +15,6 @@ usage () {
echo "Available platforms:"
echo " * linux-64"
echo " * linux-arm"
- echo " * linux-arm64"
echo " * windows-64"
echo " * other"
exit 1
@@ -65,17 +64,14 @@ if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then
check_requirement "Windows 64 Java" "ls OpenJDK*64_windows*.zip" "Missing Windows 64 JDK (https://adoptium.net/)"
check_requirement "Wine" "which wine" "Missing wine binary"
fi
-if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" -o $PLATFORM = "linux-arm64" ]; then
+if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then
check_requirement "Makeself" "which makeself" "Missing makeself binary"
fi
if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" ]; then
check_requirement "Linux 64 Java" "ls OpenJDK*x64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)"
fi
if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then
- check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)"
-fi
-if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm64" ]; then
- check_requirement "Linux ARM 64 Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM 64 JDK (https://adoptium.net/)"
+ check_requirement "Linux ARM Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)"
fi
if [ $PREREQ = false ]; then
info "Missing build requirements, aborting..."
@@ -157,23 +153,16 @@ package_linux_64 () {
package_linux_arm () {
info "Building Linux ARM installer"
- package_linux arm arm
+ package_linux arm aarch64
ok "Created Linux ARM installer"
}
-package_linux_arm64 () {
- info "Building Linux ARM 64 installer"
- package_linux arm64 aarch64
- ok "Created Linux ARM 64 installer"
-}
-
prepare
case $PLATFORM in
all)
package_linux_64
package_linux_arm
- package_linux_arm64
package_windows
package_other
;;
@@ -186,10 +175,6 @@ case $PLATFORM in
package_linux_arm
;;
- linux-arm64)
- package_linux_arm64
- ;;
-
windows-64)
package_windows
;;