ci: build openjdk in hosted runners

luncliff · May 18, 2024 · 4293da8 · 4293da8
1 parent 7e5aeae
commit 4293da8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/ports/openjdk/vcpkg.json b/ports/openjdk/vcpkg.json
@@ -1,5 +1,5 @@
 {
-  "name": "openjdk-jdk",
+  "name": "openjdk",
   "version-string": "jdk-23+10",
   "description": "JDK main-line development",
   "homepage": "https://openjdk.org/projects/jdk",

diff --git a/test/self-hosted.json b/test/self-hosted.json
@@ -1,28 +1,24 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "test",
-  "version-date": "2024-02-24",
+  "version-date": "2024-05-18",
   "description": "vcpkg registry maintained by @luncliff",
   "homepage": "https://github.com/luncliff/vcpkg-registry",
   "supports": "windows",
   "dependencies": [
-    "liblzma",
     {
       "name": "d3d12-transition-layer",
       "features": [
         "pix"
       ],
       "platform": "x64 & windows"
     },
-    {
-      "name": "winpixeventruntime",
-      "platform": "x64 & windows"
-    },
+    "liblzma",
     {
       "name": "onnxruntime",
       "features": [
-        "openvino",
         "directml",
+        "openvino",
         "python",
         "xnnpack"
       ],
@@ -35,6 +31,14 @@
         "xnnpack"
       ],
       "platform": "arm64 & windows"
+    },
+    {
+      "name": "openjdk",
+      "platform": "x64 & windows"
+    },
+    {
+      "name": "winpixeventruntime",
+      "platform": "x64 & windows"
     }
   ]
-}
+}
diff --git a/test/vcpkg.json b/test/vcpkg.json
@@ -78,10 +78,6 @@
       "name": "opencl-on-dx12",
       "platform": "windows"
     },
-    {
-      "name": "openjdk",
-      "platform": "x64 & windows"
-    },
     "openssl3",
     {
       "name": "openssl3",

diff --git a/versions/o-/openjdk.json b/versions/o-/openjdk.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "6a572f9bb56893885273b09fe82ca370ac229f36",
+      "git-tree": "0837310487647e108bc1b4ec5cd40e088675e48e",
       "version-string": "jdk-23+10",
       "port-version": 0
     }