diff --git a/.github/workflows/package-ms-compiler.yaml b/.github/workflows/package-ms-compiler.yaml index 58367e66..e4a99b8a 100644 --- a/.github/workflows/package-ms-compiler.yaml +++ b/.github/workflows/package-ms-compiler.yaml @@ -13,3 +13,6 @@ jobs: - uses: actions/checkout@v4 - shell: pwsh run: .\msvc-install\gh-msvc-install.ps1 -url https://aka.ms/vs/17/pre/vs_BuildTools.exe + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/msvc-install/gh-msvc-install.ps1 b/msvc-install/gh-msvc-install.ps1 index bf2ff307..8cffb8f2 100644 --- a/msvc-install/gh-msvc-install.ps1 +++ b/msvc-install/gh-msvc-install.ps1 @@ -30,9 +30,6 @@ function Install New-Item -ItemType Directory -Force "$full_install_root" Write-Host "Installating in : $full_install_root" Start-Process -Wait -FilePath "$installer" -ArgumentList @("--quiet", "--installPath", "$full_install_root", "--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "--add", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "--add", "Microsoft.VisualStudio.Component.VC.Tools.ARM") - Write-Host "Looking in : $full_install_root" - Get-ChildItem -Path "$full_install_root" -Recurse - Write-Host "Looked in : $full_install_root" } function ZipVC @@ -47,18 +44,19 @@ function ZipVC & "7z.exe" a "$archives/$compilerVersion-$productVersion.zip" "$full_install_root/VC/Tools/MSVC/$compilerVersion-$productVersion" } -New-Item -ItemType Directory -Force "$full_install_root" - -Download -url $url -Install - -$dir = "$full_install_root/VC/Tools/MSVC" -Get-ChildItem $dir | Foreach-Object { - $compilerVersion = $_.Name - Write-Host "Compiler directory version: $compilerVersion" - - $compilerExeProductVersion = (Get-Item "$dir/$compilerVersion/bin/Hostx64/x64/cl.exe").VersionInfo.ProductVersionRaw - Write-Host "Compiler exe version: $compilerExeProductVersion" - - ZipVC -compilerVersion $compilerVersion -productVersion $compilerExeProductVersion -} +& aws s3 ls s3://compiler-explorer/opt-nonfree/msvc/ +#New-Item -ItemType Directory -Force "$full_install_root" +# +#Download -url $url +#Install +# +#$dir = "$full_install_root/VC/Tools/MSVC" +#Get-ChildItem $dir | Foreach-Object { +# $compilerVersion = $_.Name +# Write-Host "Compiler directory version: $compilerVersion" +# +# $compilerExeProductVersion = (Get-Item "$dir/$compilerVersion/bin/Hostx64/x64/cl.exe").VersionInfo.ProductVersionRaw +# Write-Host "Compiler exe version: $compilerExeProductVersion" +# +# ZipVC -compilerVersion $compilerVersion -productVersion $compilerExeProductVersion +#}