Skip to content

Commit 4b630a5

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

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

.github/workflows/build-toolchain.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/cache@v4
4242
with:
4343
path: C:\VC6
44-
key: vc6-permanent-cache-v1
44+
key: vc6-permanent-cache-v2
4545

4646
- name: Cache CMake Dependencies
4747
id: cache-cmake-deps
@@ -50,30 +50,29 @@ 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: "D0EE1F6DCEF7DB3AD703120D9FB4FAD49EBCA28F44372E40550348B1C00CA583"
57+
COMMIT: "001c4bafdcf2ef4b474d693acccd35a91e848f40"
6058
shell: pwsh
6159
run: |
6260
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
61+
Invoke-WebRequest -Uri https://github.com/itsmattkc/MSVC600/archive/$env:COMMIT.zip -OutFile VS6_VisualStudio6.zip
6462
6563
Write-Host "Verifying File Integrity" -ForegroundColor Cyan
66-
$fileHash = (Get-FileHash -Path VS6_VisualStudio6.7z -Algorithm SHA256).Hash
64+
$fileHash = (Get-FileHash -Path VS6_VisualStudio6.zip -Algorithm SHA256).Hash
6765
Write-Host "Downloaded file SHA256: $fileHash"
6866
Write-Host "Expected file SHA256: $env:EXPECTED_HASH"
69-
if ($hash -ne $env:EXPECTED_HASH) {
67+
if ($fileHash -ne $env:EXPECTED_HASH) {
7068
Write-Error "Hash verification failed! File may be corrupted or tampered with."
7169
exit 1
7270
}
7371
7472
Write-Host "Extracting Archive" -ForegroundColor Cyan
75-
& 7z x VS6_VisualStudio6.7z -oC:\VC6
76-
Remove-Item VS6_VisualStudio6.7z -Verbose
73+
& Expand-Archive -Path VS6_VisualStudio6.zip -DestinationPath C:\VC6
74+
Move-Item -Path C:\VC6\MSVC600-$env:COMMIT -Destination C:\VC6\VC6SP6
75+
Remove-Item VS6_VisualStudio6.zip -Verbose
7776
7877
- name: Set Up VC6 Environment
7978
if: startsWith(inputs.preset, 'vc6')

0 commit comments

Comments
 (0)