fetch latest and recommended instead of api and minecraft

.github/workflows/pushDocker.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - master
     paths:
-      - minecraft-versions.json
-      - api-versions.json
+      - latest-versions.json
+      - recommended-versions.json
       - Dockerfile
       - build-images.sh
   workflow_dispatch:

build-images.sh

@@ -21,7 +21,7 @@ build_image() {
         .
     rm "$sponge_jar_file"
 
-    local tags=("$kind-$version" "$kind-$asset")
+    local tags=("$kind-$version" "$asset")
     for t in "${tags[@]}"
     do
         local name="$repo_name:$t"
@@ -43,5 +43,5 @@ build_images() {
     done
 }
 
-build_images minecraft
-build_images api
+build_images latest
+build_images recommended

fetch-versions.sh

@@ -1,15 +1,6 @@
 #!/usr/bin/env bash
 
-minecraft_versions=(
-    1.20.2
-    1.20.1
-    1.19.4
-    1.19.3
-    1.19.2
-    1.18.2
-    1.17.1
-    1.16.5
-)
+set -euo pipefail
 
 api_versions=(
     11
@@ -20,30 +11,31 @@ api_versions=(
 
 fetch_versions() {
     local kind="${1?no kind!}"
-    shift 1
+    local recommended="${2?no recommended flag!}"
+    shift 2
     for v in "$@"
     do
-        curl -s "https://dl-api.spongepowered.org/v2/groups/org.spongepowered/artifacts/spongevanilla/versions?tags=${kind}:${v}&offset=0&limit=1" \
-            | jq --arg version "$v" -Mc '{key: $version, value: .artifacts | to_entries | first | .key}'
+        curl -s "https://dl-api.spongepowered.org/v2/groups/org.spongepowered/artifacts/spongevanilla/versions?tags=${kind}:${v}&recommended=${recommended}&offset=0&limit=1" \
+            | jq --arg version "$v" -Mc '{key: $version, value: (.artifacts // {}) | to_entries | first | .key}'
     done
 }
 
 transform_to_versions() {
-    jq -s 'sort_by(.key) | from_entries'
+    jq -s 'sort_by(.key) | map(select(.value != null)) | from_entries'
 }
 
 versions_file="$(mktemp)"
 
-minecraft_versions_file="minecraft-versions.json"
-api_versions_file="api-versions.json"
+latest_versions_file="latest-versions.json"
+recommended_versions_file="recommended-versions.json"
 
-fetch_versions "minecraft" "${minecraft_versions[@]}" | transform_to_versions > "$minecraft_versions_file"
-fetch_versions "api" "${api_versions[@]}" | transform_to_versions > "$api_versions_file"
+fetch_versions "api" false "${api_versions[@]}" | transform_to_versions > "$latest_versions_file"
+fetch_versions "api" true "${api_versions[@]}" | transform_to_versions > "$recommended_versions_file"
 
 git config user.name 'CubeEngine Sponge Updater'
 git config user.email '[email protected]'
 
-git add "$minecraft_versions_file" "$api_versions_file"
+git add "$latest_versions_file" "$recommended_versions_file"
 
 if git commit -m 'My hands are typing words....'
 then

recommended-versions.json

@@ -0,0 +1,3 @@
+{
+  "8": "1.16.5-8.2.0"
+}