Skip to content

Commit a8cf6db

Browse files
committed
8371334: [8u] GHA: installation of VS2010 hangs
Reviewed-by: andrew
1 parent 18438d2 commit a8cf6db

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

.github/workflows/submit.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,10 @@ jobs:
881881
VS2010_TORRENT_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_TORRENT_URL }}"
882882
VS2010_TORRENT_DIR: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_TORRENT_DIR }}"
883883
VS2010_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).VS2010_SHA256 }}"
884+
PS2DLC_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_FILENAME }}"
885+
PS2DLC_DIR: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_DIR }}"
886+
PS2DLC_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_URL }}"
887+
PS2DLC_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).PS2DLC_SHA256 }}"
884888

885889
steps:
886890
- name: Restore cygwin installer from cache
@@ -936,6 +940,26 @@ jobs:
936940
Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION"
937941
if: steps.bootjdk.outputs.cache-hit != 'true'
938942

943+
- name: Restore PowerShell 2 from cache
944+
id: ps2dlc
945+
uses: actions/cache@v4
946+
with:
947+
path: ~/${{ env.PS2DLC_DIR }}
948+
key: ps2dlc
949+
950+
- name: Download and unpack PowerShell 2
951+
run: |
952+
& curl -L "$env:PS2DLC_URL" -o "$HOME/$env:PS2DLC_FILENAME"
953+
$FileHash = Get-FileHash -Algorithm SHA256 "$HOME/$env:PS2DLC_FILENAME"
954+
$FileHash.Hash -eq $env:PS2DLC_SHA256
955+
& unzip "$HOME/$env:PS2DLC_FILENAME" -d "$HOME"
956+
if: steps.ps2dlc.outputs.cache-hit != 'true'
957+
958+
- name: Install PowerShell 2
959+
run: |
960+
cd "$HOME/$env:PS2DLC_DIR"
961+
& powershell.exe -executionpolicy bypass -file ./loadGAC.ps1
962+
939963
- name: Restore Visual Studio 2010 from cache
940964
id: vs2010
941965
uses: actions/cache@v4

make/conf/test-dependencies

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ VS2017_FILENAME=vs2017.exe
4040
VS2017_URL=https://github.com/akashche/msvs_2017_installer_bootstrap/raw/master/vs_community__7955ddbf8a9b49dda0f8d18876e93bd2.exe
4141
VS2017_SHA256=ca4ebbc3bee27caa44ef91b21bc30837a028c23a046c009600038316e5976b5b
4242

43+
PS2DLC_FILENAME=ps2DLC.zip
44+
PS2DLC_DIR=ps2DLC
45+
PS2DLC_URL=https://download.microsoft.com/download/2b37839b-e146-465a-a78c-c9066609c553/ps2DLC.zip
46+
PS2DLC_SHA256=d9812e7be1f72ff49d73f3179e207aa0000852d9d0efd92455ad376fad5d9b7c
47+
4348
WINDOWS_X64_BOOT_JDK_FILENAME=openjdk-8_windows-x64_bin.zip
4449
WINDOWS_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_windows_hotspot_8u322b06.zip
4550
WINDOWS_X64_BOOT_JDK_SHA256=c9e06afb5df850e90a4da9da31c2edf10bd6da9962c4b253e91b41237f8fb2fb

0 commit comments

Comments
 (0)