[windows] fix sccache installation on arm64 #84292
Conversation
|
@swift-ci please smoke test |
utils/build.ps1
Outdated
| Write-Output "Extracting '$TarBallFileName' ..." | ||
| New-Item -ItemType Directory -ErrorAction Ignore -Path $destination | Out-Null | ||
| try { | ||
| tar -xvf $source -C $destination | Out-Null |
There was a problem hiding this comment.
Will this actually ever throw?
There was a problem hiding this comment.
This should not. I thought that if tar returned 1 the function would throw but that's not the case. Fixed, thanks!
utils/build.ps1
Outdated
| } | ||
| catch { |
There was a problem hiding this comment.
Removed the try/catch altogether.
utils/build.ps1
Outdated
| } | ||
| } | ||
|
|
||
| $destination = if ($CreateExtractPath) { $destination } else { $BinaryCache } |
There was a problem hiding this comment.
I copied the Expand-ZipFile function to have the same functionalities. That's not needed in this patch, I removed it.
utils/build.ps1
Outdated
| [string]$TarBallFileName, | ||
| [string]$BinaryCache, | ||
| [string]$ExtractPath, | ||
| [bool]$CreateExtractPath = $true |
There was a problem hiding this comment.
These map to names, so please rename these:
TarBallFileName -> Source
ExtractPath -> Destination
CreateExtractPath -> CreateDestination
Do we ever invoke this with CreateDestinattion being $false? If not, perhaps we should just drop the parameter.
There was a problem hiding this comment.
Removed CreateDestination as we only call the function in one place.
The initial name of the parameters was copied from the Expand-ZipFile function. I have renamed them.
charles-zablit
force-pushed
the
charles-zablit/windows/fix-sccache-installation-arm64
branch
from
0b8ffb3 to
6c109eb
Compare
charles-zablit
force-pushed
the
charles-zablit/windows/fix-sccache-installation-arm64
branch
from
6c109eb to
071c789
Compare
|
@swift-ci please test |
utils/build.ps1
Outdated
| @@ -1174,6 +1174,31 @@ function Get-Dependencies { | |||
| Expand-Archive -Path $source -DestinationPath $destination -Force | |||
| } | |||
|
|
|||
| function Expand-TarBall { | |||
There was a problem hiding this comment.
Can we rename this to Expand-TapeArchive or Expand-TarFile? "tarball" is a very unix-y colloquialism.
There was a problem hiding this comment.
Switched to using Expand-TapeArchive.
utils/build.ps1
Outdated
| $source = Join-Path -Path $BinaryCache -ChildPath $SourceName | ||
| $destination = Join-Path -Path $BinaryCache -ChildPath $DestinationName |
There was a problem hiding this comment.
Fixed, thanks!
charles-zablit
force-pushed
the
charles-zablit/windows/fix-sccache-installation-arm64
branch
from
071c789 to
5cc226a
Compare
|
@swift-ci please smoke test |
utils/build.ps1
Outdated
| @@ -1227,8 +1252,13 @@ function Get-Dependencies { | |||
|
|
|||
| if ($EnableCaching) { | |||
| $SCCache = Get-SCCache | |||
| DownloadAndVerify $SCCache.URL "$BinaryCache\sccache-$SCCacheVersion.zip" $SCCache.SHA256 | |||
| Expand-ZipFile sccache-$SCCacheVersion.zip $BinaryCache sccache-$SCCacheVersion | |||
| $FileExtension = if ($SCCache.URL.EndsWith('.tar.gz')) { "tar.gz" } else { "zip" } | |||
There was a problem hiding this comment.
[System.IO.Path]::GetExtension() is better to get the extension; that along with the inversion below should work.
if ($Extension -eq "zip") {
Expand-ZipFile ...
} else {
Expand-TapeArchive ...
}There was a problem hiding this comment.
Thanks! Testing only on Windows for now because I'm not sure if this API works for URLs as well.
There was a problem hiding this comment.
Seems to be working!
charles-zablit
force-pushed
the
charles-zablit/windows/fix-sccache-installation-arm64
branch
from
5cc226a to
1312cb7
Compare
|
@swift-ci please smoke test windows |
|
@swift-ci please smoke test linux |
|
@swift-ci please smoke test macos |
|
@swift-ci please test windows |
1 similar comment
|
@swift-ci please test windows |
2 participants
Add an
Extract-TarBallfunction to build.ps1 and use it to extractSCCachearchives instead ofExtract-ZipFileon ARM64 Windows.SCCacheis released as a.tar.gzfile on ARM64 Windows, but as a.zipfile on x64 Windows. Because of this, with the-EnableCachineflag,build.ps1fails to installSCCacheon ARM64 Windows. This patch introduces anExtract-TarBallfunction which is then used to extracttar.gzfiles.