build: Use build matrix instead of branches for variants

2026-03-27 00:42:45 +00:00 · 2022-01-28 21:49:29 -06:00
parent 8f8acc40f5
commit 0b71383146
19 changed files with 119 additions and 85 deletions
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -116,39 +116,30 @@ fi
 log "Resolving type given ${TYPE}"
 case "${TYPE^^}" in
  *BUKKIT|SPIGOT)
-    exec ${SCRIPTS:-/}start-deployBukkitSpigot "$@"
+    exec "${SCRIPTS:-/}start-deployBukkitSpigot" "$@"
  ;;

  PAPER)
-    exec ${SCRIPTS:-/}start-deployPaper "$@"
+    exec "${SCRIPTS:-/}start-deployPaper" "$@"
  ;;

  FORGE)
-    if versionLessThan 1.17; then
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
-    fi
-    exec ${SCRIPTS:-/}start-deployForge "$@"
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployForge" "$@"
  ;;

  FABRIC)
-    exec ${SCRIPTS:-/}start-deployFabric "$@"
+    exec "${SCRIPTS:-/}start-deployFabric" "$@"
  ;;

  FTBA)
-    exec ${SCRIPTS:-/}start-deployFTBA "$@"
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployFTBA" "$@"
  ;;

  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "NOTE: Some mods and modpacks may require Java 8."
-    log "      If so, use itzg/minecraft-server:java8"
-    log "**********************************************************************"
-    exec ${SCRIPTS:-/}start-deployCF "$@"
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployCF" "$@"
  ;;

  VANILLA)
@@ -156,22 +147,26 @@ case "${TYPE^^}" in
  ;;

  SPONGEVANILLA)
-    exec ${SCRIPTS:-/}start-deploySpongeVanilla "$@"
+    exec "${SCRIPTS:-/}start-deploySpongeVanilla" "$@"
  ;;

  CUSTOM)
-    exec ${SCRIPTS:-/}start-deployCustom "$@"
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployCustom" "$@"
  ;;

  MAGMA)
-    exec ${SCRIPTS:-/}start-deployMagma "$@"
+    evaluateJavaCompatibilityForForge
+    exec "${SCRIPTS:-/}start-deployMagma" "$@"
  ;;

  MOHIST)
+    evaluateJavaCompatibilityForForge
    exec ${SCRIPTS:-/}start-deployMohist "$@"
  ;;

  CATSERVER)
+    evaluateJavaCompatibilityForForge
    exec ${SCRIPTS:-/}start-deployCatserver "$@"
  ;;

--- a/scripts/start-deployAirplane
+++ b/scripts/start-deployAirplane
@@ -42,6 +42,5 @@ fi

 # Normalize on Spigot for later operations
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec "${SCRIPTS:-/}start-spiget" "$@"
--- a/scripts/start-deployBukkitSpigot
+++ b/scripts/start-deployBukkitSpigot
@@ -127,6 +127,5 @@ fi

 # Normalize on Spigot for operations below
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployCanyon
+++ b/scripts/start-deployCanyon
@@ -44,6 +44,5 @@ fi

 # Normalize on Spigot for later operations
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployCatserver
+++ b/scripts/start-deployCatserver
@@ -1,6 +1,7 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 set -o pipefail
 set -e

@@ -26,8 +27,6 @@ if [ ! -f ${SERVER} ]; then
  curl -H "Accept:application/octet-stream" -o "$SERVER" -fsSL https://api.github.com/repos/Luohuayu/CatServer/releases/assets/${latestJarId}
 fi

-export SKIP_LOG4J_CONFIG=true
-
 export FAMILY=HYBRID
-# Continue to Final Setup
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+
+exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployCrucible
+++ b/scripts/start-deployCrucible
@@ -55,7 +55,6 @@ if [ ! -d "$librariesDir" ]; then
 fi

 export SERVER
-export SKIP_LOG4J_CONFIG=true
 export FAMILY=HYBRID

 exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
--- a/scripts/start-deployCustom
+++ b/scripts/start-deployCustom
@@ -1,6 +1,7 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

 if isURL ${CUSTOM_SERVER}; then
@@ -30,6 +31,6 @@ else

 fi

-export SKIP_LOG4J_CONFIG=true
 export FAMILY=HYBRID
+
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployFTBA
+++ b/scripts/start-deployFTBA
@@ -2,7 +2,8 @@

 ftbInstallMarker=".ftb-installed"

-. ${SCRIPTS:-/}start-utils
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x
 set -e

@@ -80,4 +81,5 @@ if ! [ -v SERVER ]; then
 fi

 export FAMILY=FORGE
+
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployForge
+++ b/scripts/start-deployForge
@@ -38,18 +38,23 @@ install() {
    get_installer "$normForgeVersion" "$shortForgeVersion"
  fi

-  log "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
+  log "Installing Forge $shortForgeVersion. This might take a minute or two..."
  mkdir -p mods
  tries=3
-  while ((--tries >= 0)); do
-    if java -jar "$FORGE_INSTALLER" --installServer; then
-      break
+  while true; do
+    if ! java -jar "$FORGE_INSTALLER" --installServer &> forge-installer.log; then
+      if ((--tries <= 0)); then
+        cat forge-installer.log
+        log "
+ERROR Forge failed to install after several tries.
+"
+        exit 1
+      fi
+      log "Install failed. Trying again..."
+    else
+      break # out of this loop
    fi
  done
-  if ((tries < 0)); then
-    log "Forge failed to install after several tries." >&2
-    exit 10
-  fi
  # NOTE $shortForgeVersion will be empty if installer location was given to us
  log "Finding installed server jar..."
  unset -v latest
@@ -148,4 +153,5 @@ else
 fi

 export FAMILY=FORGE
+
 exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployLimbo
+++ b/scripts/start-deployLimbo
@@ -58,7 +58,5 @@ if [[ ${LEVEL} != *\;* ]]; then
 fi
 export LEVEL

-export SKIP_LOG4J_CONFIG=true
-
 export FAMILY=LIMBO
 exec ${SCRIPTS:-/}start-setupWorld $@
--- a/scripts/start-deployMagma
+++ b/scripts/start-deployMagma
@@ -1,13 +1,12 @@
 #!/bin/bash

-. ${SCRIPTS:-/}start-utils
-export SKIP_LOG4J_CONFIG=true
-
+# shellcheck source=start-utils
+. "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

-: ${VANILLA_VERSION?}
+: "${VANILLA_VERSION?}"
 # stable, dev
-: ${MAGMA_CHANNEL:=stable}
+: "${MAGMA_CHANNEL:=stable}"


 magmaDownloadServer() {
@@ -90,4 +89,5 @@ else
 fi

 export FAMILY=HYBRID
-exec ${SCRIPTS:-/}start-setupWorld "$@"
+
+exec "${SCRIPTS:-/}start-setupWorld" "$@"
--- a/scripts/start-deployMohist
+++ b/scripts/start-deployMohist
@@ -38,7 +38,6 @@ if [ ! -f "${SERVER}" ]; then
  get -o "${SERVER}" "${mohistJob}${MOHIST_BUILD}/artifact/${buildRelPath}"
 fi

-export SKIP_LOG4J_CONFIG=true
-
 export FAMILY=HYBRID
+
 exec "${SCRIPTS:-$(dirname "$0")}/start-setupWorld" "$@"
--- a/scripts/start-deployPaper
+++ b/scripts/start-deployPaper
@@ -74,6 +74,5 @@ fi

 # Normalize on Spigot for downstream operations
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployPufferfish
+++ b/scripts/start-deployPufferfish
@@ -40,6 +40,5 @@ fi

 # Normalize on Spigot for later operations
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec ${SCRIPTS:-/}start-spiget "$@"
--- a/scripts/start-deployPurpur
+++ b/scripts/start-deployPurpur
@@ -6,9 +6,9 @@ IFS=$'\n\t'
 . "${SCRIPTS:-/}start-utils"
 isDebugging && set -x

-: ${VANILLA_VERSION:?}
-: ${PURPUR_BUILD:=LATEST}
-: ${FORCE_REDOWNLOAD:=false}
+: "${VANILLA_VERSION:?}"
+: "${PURPUR_BUILD:=LATEST}"
+: "${FORCE_REDOWNLOAD:=false}"

 if [[ ${PURPUR_BUILD} == LATEST ]]; then
  if ! PURPUR_BUILD=$(get --json-path=".builds.latest" "https://api.purpurmc.org/v2/purpur/${VANILLA_VERSION}"); then
@@ -31,6 +31,5 @@ fi

 # Normalize on Spigot for later operations
 export FAMILY=SPIGOT
-export SKIP_LOG4J_CONFIG=true

 exec "${SCRIPTS:-/}start-spiget" "$@"
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -243,6 +243,10 @@ EOF
 elif [[ $SERVER =~ run.sh ]]; then
  log "Using Forge supplied run.sh script..."
  echo $JVM_XX_OPTS $JVM_OPTS $expandedDOpts > user_jvm_args.txt
+  if isTrue ${SETUP_ONLY:=false}; then
+    echo "SETUP_ONLY: bash ${SERVER}"
+    exit
+  fi
  exec mc-server-runner "${mcServerRunnerArgs[@]}" --shell bash "${SERVER}"
 else
  # If we have a bootstrap.txt file... feed that in to the server stdin
--- a/scripts/start-utils
+++ b/scripts/start-utils
@@ -183,6 +183,7 @@ function isFamily() {
 }
 function isType() {
  for t in "${@}"; do
+    # shellcheck disable=SC2153
    if [[ $TYPE == "$t" ]]; then
      return 0
    fi
@@ -190,6 +191,17 @@ function isType() {
  return 1
 }

+function evaluateJavaCompatibilityForForge() {
+  javaRelease=$(mc-image-helper java-release)
+  if versionLessThan 1.18 && (( javaRelease > 8 )); then
+    log "**********************************************************************"
+    log "WARNING: Some mods and modpacks may require Java 8."
+    log "         Please use itzg/minecraft-server:java8"
+    log "**********************************************************************"
+    sleep 5
+  fi
+}
+
 function extract() {
  src=${1?}
  destDir=${2?}