Merge pull request #928 from kloptops/main

Added back java runtimes, updated build_release to use HashCache on pmserver, updated prepare_repo.sh to not spam so much.
PortsMaster · Nov 13, 2024 · 51e9e09 · 51e9e09
2 parents baf72d7 + 25a2b75
commit 51e9e09
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 6 deletions.
diff --git a/runtimes/.gitignore b/runtimes/.gitignore
@@ -1,2 +1,6 @@
 # Autogenerated by tools/build_data.py
 mono-6.12.0.122-aarch64.squashfs
+zulu11.48.21-ca-jdk11.0.11-linux.aarch64.squashfs
+zulu17.48.15-ca-jdk17.0.10-linux.aarch64.squashfs
+zulu17.48.15-ca-jdk17.0.10-linux.armhf.squashfs
+zulu17.48.15-ca-jdk17.0.10-linux.x86_64.squashfs
diff --git a/runtimes/runtimes.json b/runtimes/runtimes.json
@@ -102,5 +102,21 @@
         "arch": {
             "aarch64": "solarus-1.6.5.aarch64.squashfs"
         }
+    },
+    "zulu11.48.21-ca-jdk11.0.11-linux.aarch64.squashfs":  {
+        "name": "Java jdk11.0.11",
+        "default": "aarch64",
+        "arch": {
+            "aarch64": "zulu11.48.21-ca-jdk11.0.11-linux.aarch64.squashfs"
+        }
+    },
+    "zulu17.48.15-ca-jdk17.0.10-linux.aarch64.squashfs":  {
+        "name": "Java jdk17.0.10",
+        "default": "aarch64",
+        "arch": {
+            "aarch64": "zulu17.48.15-ca-jdk17.0.10-linux.aarch64.squashfs",
+            "x86_64": "zulu17.48.15-ca-jdk17.0.10-linux.x86_64.squashfs",
+            "armhf": "zulu17.48.15-ca-jdk17.0.10-linux.armhf.squashfs"
+        }
     }
 }