From 8a05d9010b5f1eaec530afc5c68cad4c452bfbca Mon Sep 17 00:00:00 2001
From: Nicolas Berthier <nicolas.berthier@ocamlpro.com>
Date: Thu, 22 Aug 2024 10:14:20 +0200
Subject: [PATCH 1/2] Download openjdk8 in mingw32 CI

---
 .github/workflows/windows-java.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/windows-java.yml b/.github/workflows/windows-java.yml
index 04fe09f6a..db8d7fe0e 100644
--- a/.github/workflows/windows-java.yml
+++ b/.github/workflows/windows-java.yml
@@ -34,6 +34,30 @@ jobs:
                    mingw-w64-${{matrix.env}}-cc
                    mingw-w64-${{matrix.env}}-gmp
 
+      - name: Check x86 openjdk8 (hotspot)
+        if: matrix.sys == 'mingw32'
+        uses: actions/cache@v4
+        id: openjdk8
+        with:
+          path: openjdk8.zip
+          key: openjdk8
+          save-always: true
+
+      - name: Download x86 openjdk8 (hotspot)
+        if: matrix.sys == 'mingw32' && steps.openjdk8.outputs.cache-hit != 'true'
+        run: |
+           wget -O openjdk8.zip \
+              "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x86-32_windows_hotspot_8u422b05.zip"
+        shell: msys2 {0}
+
+      - name: Unzip x86 openjdk8 (hotspot)
+        if: matrix.sys == 'mingw32'
+        run: |
+          "/c/Program Files/7-Zip/7z.exe" x openjdk8.zip
+          echo "JAVA_HOME=$(PWD)/jdk8u422-b05"
+          echo "JAVA_HOME=$(PWD)/jdk8u422-b05" >> ~/.bash_profile
+        shell: msys2 {0}
+
       - name: Set git user
         run: |
           git config --global user.name github-actions

From 4208d3178c645cb107f44d2612c49c09330cd210 Mon Sep 17 00:00:00 2001
From: Nicolas Berthier <nicolas.berthier@ocamlpro.com>
Date: Thu, 22 Aug 2024 10:24:43 +0200
Subject: [PATCH 2/2] Select Java 21 for non-mingw32 CIs

---
 .github/workflows/windows-java.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/windows-java.yml b/.github/workflows/windows-java.yml
index db8d7fe0e..e03fcc1ce 100644
--- a/.github/workflows/windows-java.yml
+++ b/.github/workflows/windows-java.yml
@@ -58,6 +58,14 @@ jobs:
           echo "JAVA_HOME=$(PWD)/jdk8u422-b05" >> ~/.bash_profile
         shell: msys2 {0}
 
+      - name: Select Java 21
+        if: matrix.sys != 'mingw32'
+        run: |
+          echo "JAVA_HOME=$JAVA_HOME_21_X64"
+          echo "JAVA_HOME='$(cygpath -u "$JAVA_HOME_21_X64")'" \
+            >> ~/.bash_profile
+        shell: msys2 {0}
+
       - name: Set git user
         run: |
           git config --global user.name github-actions