Update for 26.1.2
This commit is contained in:
@@ -82,12 +82,34 @@ for ver in "${versions[@]}"; do
|
||||
BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.10" || echo "$BUILD_JAVA_21,1.21.10" )
|
||||
elif [[ "$ver" =~ ^1\.21\.11$ ]]; then
|
||||
BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "1.21.11" || echo "$BUILD_JAVA_21,1.21.11" )
|
||||
elif [[ "$ver" =~ ^26\.1(\.[12])?$ ]]; then
|
||||
BUILD_JAVA_25=$( [ -z ${BUILD_JAVA_25+x} ] && echo "26.1.2" || echo "$BUILD_JAVA_25,26.1.2" )
|
||||
else
|
||||
echo "Unknown version $ver, attempting to build with java 21"
|
||||
BUILD_JAVA_21=$( [ -z ${BUILD_JAVA_21+x} ] && echo "$ver" || echo "$BUILD_JAVA_21,$ver" )
|
||||
echo "Unknown version $ver, attempting to build with java 25"
|
||||
BUILD_JAVA_25=$( [ -z ${BUILD_JAVA_25+x} ] && echo "$ver" || echo "$BUILD_JAVA_21,$ver" )
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ! -z ${BUILD_JAVA_25+x} ]; then
|
||||
if [ -z ${JAVA_VERSION+x} ]; then
|
||||
JAVA_VERSION=25
|
||||
echo "No java version specified, defaulting to 25"
|
||||
fi
|
||||
|
||||
echo "Checking for java 25 spigot builds: $BUILD_JAVA_25"
|
||||
|
||||
docker run --rm \
|
||||
--user $(id -u):$(id -g) \
|
||||
-e MAVEN_CONFIG=/var/maven/.m2 \
|
||||
-e M2_PATH=/var/maven/.m2 \
|
||||
-e REV="$BUILD_JAVA_25" \
|
||||
-e SERVER_REQUIRED="$SERVER_REQUIRED" \
|
||||
--volume "$BUILD_DIRECTORY:/build" \
|
||||
--volume "$M2_DIRECTORY:/var/maven/.m2" \
|
||||
--volume "$SCRIPT_DIR/scripts:/scripts" \
|
||||
-- docker.io/maven:3.9.14-eclipse-temurin-25 ./scripts/install-spigot.sh
|
||||
fi
|
||||
|
||||
if [ ! -z ${BUILD_JAVA_21+x} ]; then
|
||||
if [ -z ${JAVA_VERSION+x} ]; then
|
||||
JAVA_VERSION=21
|
||||
|
||||
Reference in New Issue
Block a user