diff --git a/coin/provisioning/common/linux/sccache.sh b/coin/provisioning/common/linux/sccache.sh index 73894902..2e605996 100755 --- a/coin/provisioning/common/linux/sccache.sh +++ b/coin/provisioning/common/linux/sccache.sh @@ -6,13 +6,13 @@ set -ex source "${BASH_SOURCE%/*}/../unix/sccache.sh" -targetVersion=v0.11.0 +targetVersion=v0.15.0 if [[ $(uname -m) == 'aarch64' ]]; then targetArch=aarch64-unknown-linux-musl - sha1=b7606d0fb461c0aa7351f511d9223416a322d52a + sha256=3a6a3712b49da3d263bf2d30d702de4302793016019e800bfb81c0c69401d8f8 else targetArch=x86_64-unknown-linux-musl - sha1=ef389a20c85b732cccd48436a5e28ed40bed2806 + sha256=782d2b5dd7ae0a55ebe368ab258114d0928d019ac2d949ab85d5d02f3926709e fi -installSccache "$targetArch" "$targetVersion" "$sha1" +installSccache "$targetArch" "$targetVersion" "$sha256" diff --git a/coin/provisioning/common/macos/sccache.sh b/coin/provisioning/common/macos/sccache.sh index 29845727..17dc0d5d 100755 --- a/coin/provisioning/common/macos/sccache.sh +++ b/coin/provisioning/common/macos/sccache.sh @@ -6,12 +6,12 @@ set -ex source "${BASH_SOURCE%/*}/../unix/sccache.sh" -targetVersion=v0.11.0 +targetVersion=v0.15.0 if [[ `arch` == arm* ]]; then targetArch=aarch64-apple-darwin - sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec + sha256=430ef7b5f54256d3ed5bfe77e8b0afc51aa209aeebe4f95b69c3a52ce3acc6e9 else targetArch=x86_64-apple-darwin - sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16 + sha256=f8da93e0689122268f720ddb48c8357f3da18be8c88aff23a8e75a7a219367db fi -installSccache "$targetArch" "$targetVersion" "$sha1" +installSccache "$targetArch" "$targetVersion" "$sha256" diff --git a/coin/provisioning/common/unix/sccache.sh b/coin/provisioning/common/unix/sccache.sh index ab4ffd3c..2c1bacfc 100755 --- a/coin/provisioning/common/unix/sccache.sh +++ b/coin/provisioning/common/unix/sccache.sh @@ -36,4 +36,6 @@ function installSccache { # Prevents some random network I/O errors from failing compilation # Does not seem to affect much though SetEnvVar "SCCACHE_IGNORE_SERVER_IO_ERROR" "1" + # Enable a local preprocessor cache. + SetEnvVar SCCACHE_DIRECT 1 } diff --git a/coin/provisioning/common/windows/install-sccache.ps1 b/coin/provisioning/common/windows/install-sccache.ps1 index 95b4ac1c..6c1d3509 100644 --- a/coin/provisioning/common/windows/install-sccache.ps1 +++ b/coin/provisioning/common/windows/install-sccache.ps1 @@ -6,22 +6,22 @@ . "$PSScriptRoot\helpers.ps1" -$version="v0.11.0-jimis3" +$version="v0.15.0" $cpu_arch = Get-CpuArchitecture switch ($cpu_arch) { arm64 { $arch="aarch64-pc-windows-msvc" - $sha1="be429b6c33da9408bba827815d04fceeadf6dbd1" + $sha="f4f304dc9dd9bd2f9b0032a0091efac1c093934bb095f207381558f80c3d0a24" break } x64 { $arch="x86_64-pc-windows-msvc" - $sha1="bcce35f6b39e2d1d0829f2277fd749767e057486" + $sha="b0b257a164bf438b2dea134ca7ded41c100f59a64b3bf275a202f1e8102ab217" break } x86 { $arch="x86-pc-windows-gnu" - $sha1="287f4c3b7db21b72138704b8fe96827e6b1643a8" + $sha="287f4c3b7db21b72138704b8fe96827e6b1643a8" $version="0.2.13-alpha-0" break } @@ -40,7 +40,7 @@ $targetFolder = "C:\Program Files\" Write-Host "Downloading sccache $version..." Download $urlOfficial $urlCache $tempfile -Verify-Checksum $tempfile $sha1 +Verify-Checksum $tempfile $sha Write-Host "Extracting $tempfile to $targetFolder..." Extract-tar_gz $tempfile $targetFolder Remove-Item -Path $tempfile @@ -53,6 +53,8 @@ Set-EnvironmentVariable "SCCACHE_IGNORE_SERVER_IO_ERROR" "1" # add sccache to PATH Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))" +# Enable a local preprocessor cache. +Set-EnvironmentVariable "SCCACHE_DIRECT" "1" # update versions Write-Output "sccache = $version" >> ~\versions.txt