java fixes
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 2s
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 10s
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 10s
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 25s
minecraft-build-testing / Build and Push testing (push) Successful in 24s
minecraft-build-minecraft / generate-changelogs (push) Successful in 8s
minecraft-build-testing / generate-changelogs (push) Successful in 9s
minecraft-build-minecraft / generate-build-info (push) Successful in 12s
minecraft-build-testing / generate-build-info (push) Successful in 12s

This commit is contained in:
2026-07-20 07:28:40 -07:00
parent f878e3f69b
commit 3106811c5e
2 changed files with 16 additions and 16 deletions
+8 -8
View File
@@ -18,29 +18,29 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
# Install java # Install java
if [ $JAVA_VERSION = "openjdk-21-jre" ]; then if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s openjdk-21-jre-headless &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
apt-get update apt-get update
apt-get --no-install-recommends -y install $JAVA_VERSION apt-get --no-install-recommends -y install openjdk-21-jre-headless
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s openjdk-25-jre-headless &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
apt-get update apt-get update
apt-get --no-install-recommends -y install $JAVA_VERSION apt-get --no-install-recommends -y install openjdk-25-jre-headless
fi fi
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s msopenjdk-21 &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -48,12 +48,12 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
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 $JAVA_VERSION \ 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
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s msopenjdk-25 &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -61,7 +61,7 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
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 $JAVA_VERSION \ 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
+8 -8
View File
@@ -26,29 +26,29 @@ NEOFORGED_INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neof
# Install java # Install java
if [ $JAVA_VERSION = "openjdk-21-jre" ]; then if [ $JAVA_VERSION = "openjdk-21-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s openjdk-21-jre-headless &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
apt-get update apt-get update
apt-get --no-install-recommends -y install $JAVA_VERSION apt-get --no-install-recommends -y install openjdk-21-jre-headless
fi fi
if [ $JAVA_VERSION = "openjdk-25-jre" ]; then if [ $JAVA_VERSION = "openjdk-25-jre" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s openjdk-25-jre-headless &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
echo " " echo " "
echo "WARNING ! $JAVA_VERSION not installed ... will install now." echo "WARNING ! $JAVA_VERSION not installed ... will install now."
apt-get update apt-get update
apt-get --no-install-recommends -y install $JAVA_VERSION apt-get --no-install-recommends -y install openjdk-25-jre-headless
fi fi
elif [ $JAVA_VERSION = "msopenjdk-21" ]; then elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s msopenjdk-21 &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -56,12 +56,12 @@ elif [ $JAVA_VERSION = "msopenjdk-21" ]; then
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 $JAVA_VERSION \ 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
echo "INFO ! $JAVA_VERSION Selected" echo "INFO ! $JAVA_VERSION Selected"
if dpkg -s $JAVA_VERSION &> /dev/null if dpkg -s msopenjdk-25 &> /dev/null
then then
echo "INFO ! $JAVA_VERSION installed ... moving on." echo "INFO ! $JAVA_VERSION installed ... moving on."
else else
@@ -69,7 +69,7 @@ elif [ $JAVA_VERSION = "msopenjdk-25" ]; then
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 $JAVA_VERSION \ 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