Merge pull request ppy#6057 from bdach/i-love-github-and-android

Attempt to fix android compile failures due to invalid java version again
Susko3 · Nov 21, 2023 · 4a0efed · 4a0efed
2 parents 66b9058 + 9628e9f
commit 4a0efed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -25,12 +25,6 @@
       "commands": [
         "CodeFileSanity"
       ]
-    },
-    "java.openjdk": {
-      "version": "11.0.1-beta001",
-      "commands": [
-        "Java.OpenJDK"
-      ]
     }
   }
-}
+}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -108,6 +108,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: microsoft
+          java-version: 11
+
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v3
         with:

diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml
@@ -124,6 +124,12 @@ jobs:
         with:
           dotnet-version: "6.0.x"
 
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: microsoft
+          java-version: 11
+
       - name: Restore .NET workloads
         run: dotnet workload install android