diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-20 16:06:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-23 16:41:21 +0000 |
| commit | 200542194ae3c7e84492ef1ab62afe3fce0fa686 (patch) | |
| tree | c1fb2914099d06da27c8a804e962ec68b5ae67d4 | |
| parent | 3c8e55904b0dea204396dc43e179086896f464f7 (diff) | |
Provisioning: Install ninja 1.10.2 for Windows and macOS
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 e8b0be77118e9ee6bec3887807cb7e37d334c0a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/macos/ninja.sh | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/ninja.ps1 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coin/provisioning/common/macos/ninja.sh b/coin/provisioning/common/macos/ninja.sh index 9b689647..203ef953 100755 --- a/coin/provisioning/common/macos/ninja.sh +++ b/coin/provisioning/common/macos/ninja.sh @@ -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" "" diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 25e0a979..07c01578 100644 --- a/coin/provisioning/common/windows/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 @@ -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 |