lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Install ninja 1.10.2 for Windows and macOS

Browse Source 
To avoid error 'too many path components' when building Qt on Windows.

Task-number: QTBUG-95286
Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit e8b0be7711)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor
2021-07-20 16:06:58 +02:00
committed by Qt Cherry-pick Bot
parent 3c8e55904b
commit 200542194a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/provisioning/common/macos/ninja.sh
View File

@@ -38,10 +38,10 @@
# shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="1.10.1"
version="1.10.2"
internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
SHA1="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
DestDir="/usr/local/bin/"
InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""

8
coin/provisioning/common/windows/ninja.ps1
View File

@@ -1,13 +1,13 @@
. "$PSScriptRoot\helpers.ps1"
$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
$zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"
Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
Download https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-x86.zip $zip
Verify-Checksum $zip "ccacdf88912e061e0b527f2e3c69ee10544d6f8a"
Extract-7Zip $zip C:\Utils\Ninja
Remove "$zip"
Add-Path "C:\Utils\Ninja"
Write-Output "Ninja = 1.6.0" >> ~/versions.txt
Write-Output "Ninja = 1.10.2" >> ~/versions.txt