mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 07:28:21 +08:00
Update sccache to v0.11.0
Custom patched packages for windows. Also Add Windows on arm support. Pick-to: 6.11 6.10 6.8 Fixes: COIN-740 Change-Id: I27f7d36b3501be2a2011b9b8dfa0ec846cd57bf5 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
committed by
Dimitrios Apostolou
parent
7c7bbfff4d
commit
73c4ed922a
@@ -204,7 +204,7 @@ Configurations:
|
|||||||
Id: 'windows-11_23h2-arm64-msvc2022'
|
Id: 'windows-11_23h2-arm64-msvc2022'
|
||||||
Template: 'qtci-windows-11_23H2-aarch64-53'
|
Template: 'qtci-windows-11_23H2-aarch64-53'
|
||||||
Compiler: 'MSVC2022'
|
Compiler: 'MSVC2022'
|
||||||
Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
Features: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
|
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Configurations:
|
|||||||
Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
|
Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
|
||||||
Template: 'qtci-windows-11_23H2-aarch64-53'
|
Template: 'qtci-windows-11_23H2-aarch64-53'
|
||||||
Compiler: 'MSVC2022'
|
Compiler: 'MSVC2022'
|
||||||
Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
|
Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
|
||||||
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
|
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
|
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
|
||||||
@@ -44,7 +44,7 @@ Configurations:
|
|||||||
Id: 'ubuntu-24.04-arm64'
|
Id: 'ubuntu-24.04-arm64'
|
||||||
Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
|
Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
|
||||||
Compiler: 'GCC'
|
Compiler: 'GCC'
|
||||||
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
|
Features: ['Sccache', 'Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
|
||||||
Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
|
Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||||
|
|||||||
@@ -48,25 +48,25 @@ Configurations:
|
|||||||
Id: 'macos-13-arm64-tests'
|
Id: 'macos-13-arm64-tests'
|
||||||
Template: 'qtci-macos-13-arm-107'
|
Template: 'qtci-macos-13-arm-107'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['TestOnly', 'Packaging']
|
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||||
Platform dependency: 'macos-universal-on-arm64'
|
Platform dependency: 'macos-universal-on-arm64'
|
||||||
-
|
-
|
||||||
Id: 'macos-14-arm64-tests'
|
Id: 'macos-14-arm64-tests'
|
||||||
Template: 'qtci-macos-14-arm-106'
|
Template: 'qtci-macos-14-arm-106'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['TestOnly', 'Packaging']
|
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||||
Platform dependency: 'macos-universal-on-arm64'
|
Platform dependency: 'macos-universal-on-arm64'
|
||||||
-
|
-
|
||||||
Id: 'macos-15-arm64-tests'
|
Id: 'macos-15-arm64-tests'
|
||||||
Template: 'qtci-macos-15-arm-104'
|
Template: 'qtci-macos-15-arm-104'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['TestOnly', 'Packaging']
|
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||||
Platform dependency: 'macos-universal-on-arm64'
|
Platform dependency: 'macos-universal-on-arm64'
|
||||||
-
|
-
|
||||||
Id: 'macos-26-arm64-tests'
|
Id: 'macos-26-arm64-tests'
|
||||||
Template: 'qtci-macos-26-arm-104'
|
Template: 'qtci-macos-26-arm-104'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['TestOnly', 'Packaging']
|
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||||
Platform dependency: 'macos-universal-on-arm64'
|
Platform dependency: 'macos-universal-on-arm64'
|
||||||
|
|
||||||
# =========================================================================
|
# =========================================================================
|
||||||
@@ -89,7 +89,7 @@ Configurations:
|
|||||||
Id: 'macos-arm64-developer-build'
|
Id: 'macos-arm64-developer-build'
|
||||||
Template: 'qtci-macos-15-arm-104'
|
Template: 'qtci-macos-15-arm-104'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
|
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
|
||||||
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||||
@@ -99,7 +99,7 @@ Configurations:
|
|||||||
Id: 'macos-26-arm64-developer-build'
|
Id: 'macos-26-arm64-developer-build'
|
||||||
Template: 'qtci-macos-26-arm-104'
|
Template: 'qtci-macos-26-arm-104'
|
||||||
Compiler: 'Clang'
|
Compiler: 'Clang'
|
||||||
Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
|
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
|
||||||
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
||||||
Environment variables: [
|
Environment variables: [
|
||||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||||
|
|||||||
@@ -6,14 +6,13 @@ set -ex
|
|||||||
|
|
||||||
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
||||||
|
|
||||||
targetVersion=0.2.14
|
targetVersion=v0.11.0
|
||||||
|
|
||||||
if [[ $(uname -m) == 'aarch64' ]]; then
|
if [[ $(uname -m) == 'aarch64' ]]; then
|
||||||
targetArch=aarch64-unknown-linux-musl
|
targetArch=aarch64-unknown-linux-musl
|
||||||
sha1=0f9b57c423d77f7aa89bb642864ac7689d84d6a0
|
sha1=b7606d0fb461c0aa7351f511d9223416a322d52a
|
||||||
else
|
else
|
||||||
targetArch=x86_64-unknown-linux-musl
|
targetArch=x86_64-unknown-linux-musl
|
||||||
sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
|
sha1=ef389a20c85b732cccd48436a5e28ed40bed2806
|
||||||
fi
|
fi
|
||||||
|
|
||||||
installSccache "$targetArch" "$targetVersion" "$sha1"
|
installSccache "$targetArch" "$targetVersion" "$sha1"
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ set -ex
|
|||||||
|
|
||||||
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
||||||
|
|
||||||
targetVersion=0.2.14
|
targetVersion=v0.11.0
|
||||||
if [[ `arch` == arm* ]]; then
|
if [[ `arch` == arm* ]]; then
|
||||||
targetArch=aarch64-apple-darwin
|
targetArch=aarch64-apple-darwin
|
||||||
sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
|
sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
|
||||||
else
|
else
|
||||||
targetArch=x86_64-apple-darwin
|
targetArch=x86_64-apple-darwin
|
||||||
sha1=764bc1664c0ff616d9980a6d127175d0a2041781
|
sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
|
||||||
fi
|
fi
|
||||||
installSccache "$targetArch" "$targetVersion" "$sha1"
|
installSccache "$targetArch" "$targetVersion" "$sha1"
|
||||||
|
|||||||
@@ -3,14 +3,34 @@
|
|||||||
|
|
||||||
# Install mozilla sccache
|
# Install mozilla sccache
|
||||||
|
|
||||||
param(
|
|
||||||
[string]$arch="x86_64-pc-windows-msvc",
|
|
||||||
[string]$version="0.2.14",
|
|
||||||
[string]$sha1="bbdceb59d6fd7b6a3af02fb36f65c8bf324757b0"
|
|
||||||
)
|
|
||||||
|
|
||||||
. "$PSScriptRoot\helpers.ps1"
|
. "$PSScriptRoot\helpers.ps1"
|
||||||
|
|
||||||
|
$version="v0.11.0-jimis3"
|
||||||
|
$cpu_arch = Get-CpuArchitecture
|
||||||
|
switch ($cpu_arch) {
|
||||||
|
arm64 {
|
||||||
|
$arch="aarch64-pc-windows-msvc"
|
||||||
|
$sha1="be429b6c33da9408bba827815d04fceeadf6dbd1"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
x64 {
|
||||||
|
$arch="x86_64-pc-windows-msvc"
|
||||||
|
$sha1="bcce35f6b39e2d1d0829f2277fd749767e057486"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
x86 {
|
||||||
|
$arch="x86-pc-windows-gnu"
|
||||||
|
$sha1="287f4c3b7db21b72138704b8fe96827e6b1643a8"
|
||||||
|
$version="0.2.13-alpha-0"
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
default {
|
||||||
|
throw "Unknown architecture $cpu_arch"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$basename = "sccache-" + $version + "-" + $arch
|
$basename = "sccache-" + $version + "-" + $arch
|
||||||
$zipfile = $basename + ".tar.gz"
|
$zipfile = $basename + ".tar.gz"
|
||||||
$tempfile = "C:\Windows\Temp\" + $zipfile
|
$tempfile = "C:\Windows\Temp\" + $zipfile
|
||||||
@@ -28,6 +48,9 @@ Remove-Item -Path $tempfile
|
|||||||
# Turnoff idle timeout to avoid sccache shutting down
|
# Turnoff idle timeout to avoid sccache shutting down
|
||||||
Set-EnvironmentVariable "SCCACHE_IDLE_TIMEOUT" "0"
|
Set-EnvironmentVariable "SCCACHE_IDLE_TIMEOUT" "0"
|
||||||
|
|
||||||
|
# Prevents build job dying from random network I/O errors
|
||||||
|
Set-EnvironmentVariable "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
|
||||||
|
|
||||||
# add sccache to PATH
|
# add sccache to PATH
|
||||||
Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
|
Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
. "$PSScriptRoot\..\common\windows\install-sccache.ps1" "x86-pc-windows-gnu" "0.2.13-alpha-0" "287f4c3b7db21b72138704b8fe96827e6b1643a8"
|
. "$PSScriptRoot\..\common\windows\install-sccache.ps1"
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
. "$PSScriptRoot\..\common\windows\install-sccache.ps1"
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
. "$PSScriptRoot\..\common\windows\install-sccache.ps1"
|
||||||
Reference in New Issue
Block a user