From a8cf6db481b7dd9f55694a8210a7654ff70ec078 Mon Sep 17 00:00:00 2001
From: Zdenek Zambersky <zzambers@openjdk.org>
Date: Tue, 11 Nov 2025 11:24:46 +0000
Subject: [PATCH] 8371334: [8u] GHA: installation of VS2010 hangs

Reviewed-by: andrew
---
 .github/workflows/submit.yml | 24 ++++++++++++++++++++++++
 make/conf/test-dependencies  |  5 +++++
 2 files changed, 29 insertions(+)

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index ee31fda329..2988054b81 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -881,6 +881,10 @@ jobs:
       VS2010_TORRENT_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_TORRENT_URL }}"
       VS2010_TORRENT_DIR: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_TORRENT_DIR }}"
       VS2010_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_SHA256 }}"
+      PS2DLC_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_FILENAME }}"
+      PS2DLC_DIR: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_DIR }}"
+      PS2DLC_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_URL }}"
+      PS2DLC_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_SHA256 }}"
 
     steps:
       - name: Restore cygwin installer from cache
@@ -936,6 +940,26 @@ jobs:
           Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION"
         if: steps.bootjdk.outputs.cache-hit != 'true'
 
+      - name: Restore PowerShell 2 from cache
+        id: ps2dlc
+        uses: actions/cache@v4
+        with:
+          path: ~/${{ env.PS2DLC_DIR }}
+          key: ps2dlc
+
+      - name: Download and unpack PowerShell 2
+        run: |
+          & curl -L "$env:PS2DLC_URL" -o "$HOME/$env:PS2DLC_FILENAME"
+          $FileHash = Get-FileHash -Algorithm SHA256 "$HOME/$env:PS2DLC_FILENAME"
+          $FileHash.Hash -eq $env:PS2DLC_SHA256
+          & unzip "$HOME/$env:PS2DLC_FILENAME" -d "$HOME"
+        if: steps.ps2dlc.outputs.cache-hit != 'true'
+
+      - name: Install PowerShell 2
+        run: |
+          cd "$HOME/$env:PS2DLC_DIR"
+          & powershell.exe -executionpolicy bypass -file ./loadGAC.ps1
+
       - name: Restore Visual Studio 2010 from cache
         id: vs2010
         uses: actions/cache@v4
diff --git a/make/conf/test-dependencies b/make/conf/test-dependencies
index 4bc970f190..6e3024900e 100644
--- a/make/conf/test-dependencies
+++ b/make/conf/test-dependencies
@@ -40,6 +40,11 @@ VS2017_FILENAME=vs2017.exe
 VS2017_URL=https://github.com/akashche/msvs_2017_installer_bootstrap/raw/master/vs_community__7955ddbf8a9b49dda0f8d18876e93bd2.exe
 VS2017_SHA256=ca4ebbc3bee27caa44ef91b21bc30837a028c23a046c009600038316e5976b5b
 
+PS2DLC_FILENAME=ps2DLC.zip
+PS2DLC_DIR=ps2DLC
+PS2DLC_URL=https://download.microsoft.com/download/2b37839b-e146-465a-a78c-c9066609c553/ps2DLC.zip
+PS2DLC_SHA256=d9812e7be1f72ff49d73f3179e207aa0000852d9d0efd92455ad376fad5d9b7c
+
 WINDOWS_X64_BOOT_JDK_FILENAME=openjdk-8_windows-x64_bin.zip
 WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_windows_hotspot_8u322b06.zip
 WINDOWS_X64_BOOT_JDK_SHA256=c9e06afb5df850e90a4da9da31c2edf10bd6da9962c4b253e91b41237f8fb2fb