From f945fdc735c65e18f9cc9fff17efa6ba225851f7 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 17 Aug 2021 09:59:39 +0200 Subject: [PATCH] Provisioning: Install 32bit version of Ninja on Windows So it also runs on 32bit Windows. Ninja upstream switched their binary builds to 64bit with Ninja 1.7, so we need to provide our own. Amends e8b0be77118e9ee6bec3887807cb7e37d334c0a3 Pick-to: 6.2 Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0 Reviewed-by: Alexandru Croitor --- coin/provisioning/common/windows/ninja.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 07c01578..e1a29412 100644 --- a/coin/provisioning/common/windows/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 @@ -2,8 +2,8 @@ $zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip" -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" +Download http://master.qt.io/development_releases/prebuilt/ninja/v1.10.2/ninja-win-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-really-x86.zip $zip +Verify-Checksum $zip "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca" Extract-7Zip $zip C:\Utils\Ninja Remove "$zip"