banana/spigot-docker-build-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix invalid versions

Browse Source
This commit is contained in:
BananaPuncher714
2025-11-17 16:11:42 -05:00
parent 7f665af43d
commit 4a25456b7f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build-versions.sh
View File

@@ -34,7 +34,9 @@ for ver in "${versions[@]}"; do
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.11.2" || echo "$BUILD_JAVA_8,1.11.2" ) BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.11.2" || echo "$BUILD_JAVA_8,1.11.2" )
elif [[ "$ver" =~ ^1\.12(\.[12])?$ ]]; then elif [[ "$ver" =~ ^1\.12(\.[12])?$ ]]; then
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.12.2" || echo "$BUILD_JAVA_8,1.12.2" ) BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.12.2" || echo "$BUILD_JAVA_8,1.12.2" )
elif [[ "$ver" =~ ^1\.13(\.[12])?$ ]]; then elif [[ "$ver" =~ ^1\.13$ ]]; then
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.13" || echo "$BUILD_JAVA_8,1.13" )
elif [[ "$ver" =~ ^1\.13\.[12]?$ ]]; then
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.13.2" || echo "$BUILD_JAVA_8,1.13.2" ) BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.13.2" || echo "$BUILD_JAVA_8,1.13.2" )
elif [[ "$ver" =~ ^1\.14(\.[1-4])?$ ]]; then elif [[ "$ver" =~ ^1\.14(\.[1-4])?$ ]]; then
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.14.4" || echo "$BUILD_JAVA_8,1.14.4" ) BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.14.4" || echo "$BUILD_JAVA_8,1.14.4" )
@@ -47,7 +49,7 @@ for ver in "${versions[@]}"; do
elif [[ "$ver" =~ ^1\.16\.[34]$ ]]; then elif [[ "$ver" =~ ^1\.16\.[34]$ ]]; then
BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.16.4" || echo "$BUILD_JAVA_8,1.16.4" ) BUILD_JAVA_8=$( [ -z ${BUILD_JAVA_8+x} ] && echo "1.16.4" || echo "$BUILD_JAVA_8,1.16.4" )
elif [[ "$ver" =~ ^1\.17(\.*)?$ ]]; then elif [[ "$ver" =~ ^1\.17(\.*)?$ ]]; then
>&2 echo "Spigot 1.17.x not supported due to java 14 CVEs" >&2 echo "Spigot 1.17.x not supported due to java 16 CVEs"
elif [[ "$ver" =~ ^1\.18(\.1)?$ ]]; then elif [[ "$ver" =~ ^1\.18(\.1)?$ ]]; then
BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.18.1" || echo "$BUILD_JAVA_17,1.18.1" ) BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.18.1" || echo "$BUILD_JAVA_17,1.18.1" )
elif [[ "$ver" =~ ^1\.18\.2$ ]]; then elif [[ "$ver" =~ ^1\.18\.2$ ]]; then
@@ -64,7 +66,7 @@ for ver in "${versions[@]}"; do
BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.2" || echo "$BUILD_JAVA_17,1.20.2" ) BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.2" || echo "$BUILD_JAVA_17,1.20.2" )
elif [[ "$ver" =~ ^1\.20\.[34]$ ]]; then elif [[ "$ver" =~ ^1\.20\.[34]$ ]]; then
BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.4" || echo "$BUILD_JAVA_17,1.20.4" ) BUILD_JAVA_17=$( [ -z ${BUILD_JAVA_17+x} ] && echo "1.20.4" || echo "$BUILD_JAVA_17,1.20.4" )
elif [[ "$ver" =~ ^1\.20\.*$ ]]; then elif [[ "$ver" =~ ^1\.20\.[56]$ ]]; then
BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.20.6" || echo "$BUILD_JAVA_21,1.20.6" ) BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.20.6" || echo "$BUILD_JAVA_21,1.20.6" )
elif [[ "$ver" =~ ^1\.21(\.1)?$ ]]; then elif [[ "$ver" =~ ^1\.21(\.1)?$ ]]; then
BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.1" || echo "$BUILD_JAVA_21,1.21.1" ) BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.1" || echo "$BUILD_JAVA_21,1.21.1" )
@@ -106,7 +108,6 @@ if [ ! -z ${BUILD_JAVA_21+x} ]; then
-- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh -- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh
fi fi
if [ ! -z ${BUILD_JAVA_17+x} ]; then if [ ! -z ${BUILD_JAVA_17+x} ]; then
if [ -z ${JAVA_VERSION+x} ]; then if [ -z ${JAVA_VERSION+x} ]; then
JAVA_VERSION=17 JAVA_VERSION=17