fix script errors
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 3s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 12s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 8s
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 32s
minecraft-build-testing / Build and Push testing (push) Successful in 31s
minecraft-build-minecraft / generate-changelogs (push) Successful in 10s
minecraft-build-testing / generate-changelogs (push) Successful in 9s
minecraft-build-minecraft / generate-build-info (push) Successful in 10s
minecraft-build-testing / generate-build-info (push) Successful in 10s

This commit is contained in:
2026-07-20 08:49:03 -07:00
parent cfd35fa512
commit 751b7cc7f3
2 changed files with 16 additions and 16 deletions
+7 -7
View File
@@ -27,7 +27,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
apt-get update apt-get update
apt-get --no-install-recommends -y install openjdk-21-jre-headless apt-get --no-install-recommends -y install openjdk-21-jre-headless
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if [ dpkg -s openjdk-25-jre-headless &> /dev/null ] if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
then then
@@ -46,9 +46,9 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb \ dpkg -i packages-microsoft-prod.deb
apt-get update && apt-get install -y msopenjdk-21 \ apt-get update && apt-get install -y msopenjdk-21
apt-get -y update && apt-get -y --fix-broken install apt-get -y update && apt-get -y --fix-broken install
fi fi
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
@@ -59,9 +59,9 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb \ dpkg -i packages-microsoft-prod.deb
apt-get update && apt-get install -y msopenjdk-25 \ apt-get update && apt-get install -y msopenjdk-25
apt-get -y update && apt-get -y --fix-broken install apt-get -y update && apt-get -y --fix-broken install
fi fi
else else
+7 -7
View File
@@ -35,7 +35,7 @@ if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
apt-get update apt-get update
apt-get --no-install-recommends -y install openjdk-21-jre-headless apt-get --no-install-recommends -y install openjdk-21-jre-headless
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then elif [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if [ dpkg -s openjdk-25-jre-headless &> /dev/null ] if [ dpkg -s openjdk-25-jre-headless &> /dev/null ]
then then
@@ -54,9 +54,9 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb \ dpkg -i packages-microsoft-prod.deb
apt-get update && apt-get install -y msopenjdk-21 \ apt-get update && apt-get install -y msopenjdk-21
apt-get -y update && apt-get -y --fix-broken install apt-get -y update && apt-get -y --fix-broken install
fi fi
elif [ $JAVA_VERSION = "msopenjdk-25" ]; then elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
@@ -67,9 +67,9 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \ wget https://packages.microsoft.com/config/debian/$DEBIAN_VERSION/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb \ dpkg -i packages-microsoft-prod.deb
apt-get update && apt-get install -y msopenjdk-25 \ apt-get update && apt-get install -y msopenjdk-25
apt-get -y update && apt-get -y --fix-broken install apt-get -y update && apt-get -y --fix-broken install
fi fi
else else