Skip to content

Commit 4e16933

Browse files
committed
[GITHUB] Update build-toolchain to use public VC6 from itsmattkc repo
1 parent 5989558 commit 4e16933

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,30 +50,28 @@ jobs:
5050
path: build\${{ inputs.preset }}\_deps
5151
key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
5252

53-
- name: Download VC6 Portable from Cloudflare R2
53+
- name: Download VC6 Portable from itsmattkc repo
5454
if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}
5555
env:
56-
AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
57-
AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
58-
AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }}
59-
EXPECTED_HASH: "118D0F1ACBBD70C3F8B081CA4DBAF955FE0C6C359A76636E930AA89FDC551091"
56+
EXPECTED_HASH: "5FA2FB0FE61FD0E0FE08DC2C77EA33DF9947A39ED13670DD14B30DA5997F9315"
6057
shell: pwsh
6158
run: |
6259
Write-Host "Downloading VC6 Portable Installation" -ForegroundColor Cyan
63-
aws s3 cp s3://github-ci/VS6_VisualStudio6.7z VS6_VisualStudio6.7z --endpoint-url $env:AWS_ENDPOINT_URL
60+
Invoke-WebRequest -Uri https://github.com/itsmattkc/MSVC600/archive/refs/heads/master.zip -OutFile VS6_VisualStudio6.zip
6461
6562
Write-Host "Verifying File Integrity" -ForegroundColor Cyan
66-
$fileHash = (Get-FileHash -Path VS6_VisualStudio6.7z -Algorithm SHA256).Hash
63+
$fileHash = (Get-FileHash -Path VS6_VisualStudio6.zip -Algorithm SHA256).Hash
6764
Write-Host "Downloaded file SHA256: $fileHash"
6865
Write-Host "Expected file SHA256: $env:EXPECTED_HASH"
69-
if ($hash -ne $env:EXPECTED_HASH) {
66+
if ($fileHash -ne $env:EXPECTED_HASH) {
7067
Write-Error "Hash verification failed! File may be corrupted or tampered with."
7168
exit 1
7269
}
7370
7471
Write-Host "Extracting Archive" -ForegroundColor Cyan
75-
& 7z x VS6_VisualStudio6.7z -oC:\VC6
76-
Remove-Item VS6_VisualStudio6.7z -Verbose
72+
& Expand-Archive -Path VS6_VisualStudio6.zip -DestinationPath C:\VC6
73+
Move-Item -Path C:\VC6\MSVC600-master -Destination C:\VC6\VC6SP6
74+
Remove-Item VS6_VisualStudio6.zip -Verbose
7775
7876
- name: Set Up VC6 Environment
7977
if: startsWith(inputs.preset, 'vc6')

0 commit comments

Comments
 (0)