Try fixing jdk8u in GHA to VS2019

Signed-off-by: Stewart X Addison <[email protected]>
sxa · Aug 9, 2024 · 49cd835 · 49cd835
1 parent 02c3bd9
commit 49cd835
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -228,17 +228,23 @@ jobs:
          version: [jdk8u, jdk11u, jdk17u, jdk]
          variant: [temurin]
 
-     env:
-      VS2017_URL: "https://download.visualstudio.microsoft.com/download/pr/c5c75dfa-1b29-4419-80f8-bd39aed6bcd9/7ed8fa27575648163e07548ff5667b55b95663a2323e2b2a5f87b16284e481e6/vs_Community.exe"
-      VS2019_URL: "https://download.visualstudio.microsoft.com/download/pr/6b655578-de8c-4862-ad77-65044ca714cf/f29399a618bd3a8d1dcc96d349453f686b6176590d904308402a6402543e310b/vs_Community.exe"
+     - if: matrix.version != 'jdk8u'
+       env:
+        VS2017_URL: "https://download.visualstudio.microsoft.com/download/pr/c5c75dfa-1b29-4419-80f8-bd39aed6bcd9/7ed8fa27575648163e07548ff5667b55b95663a2323e2b2a5f87b16284e481e6/vs_Community.exe"
+        VS2019_URL: "https://download.visualstudio.microsoft.com/download/pr/6b655578-de8c-4862-ad77-65044ca714cf/f29399a618bd3a8d1dcc96d349453f686b6176590d904308402a6402543e310b/vs_Community.exe"
+
+     - if: matrix.version == 'jdk8u'
+       env:
+        CONFIGURE_ARGS: "--with-toolchain-version=2017"
+        VS2017_URL: "https://download.visualstudio.microsoft.com/download/pr/6b655578-de8c-4862-ad77-65044ca714cf/f29399a618bd3a8d1dcc96d349453f686b6176590d904308402a6402543e310b/vs_Community.exe"
 
      steps:
      - name: Restore cygwin packages from cache
        id: cygwin
        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
        with:
         path: C:\cygwin64
-        key: cygwin-packages-${{ runner.os }}-v1
+        key: cygwinpackages-${{ runner.os }}-v1
 
      - name: Install Cygwin and packages
        uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401