diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 956e7835..4f973ebb 100644 --- a/coin/provisioning/common/windows/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 @@ -7,7 +7,7 @@ switch ($cpu_arch) { $version = "1.12.0" $longPathFixed = $true # fixed https://github.com/ninja-build/ninja/pull/2225 in 1.12.0 $zip = Get-DownloadLocation "ninja-$version-win-$arch.zip" - $internalUrl = "https://ci-files01-hki.ci.qt.io/input/ninja/v$version/ninja-win$arch.zip" + $internalUrl = "https://ci-files01-hki.ci.qt.io/input/ninja/ninja-$version-win-$arch.zip" $externalUrl = "https://github.com/ninja-build/ninja/releases/download/v$version/ninja-win$arch.zip" $sha1 = "51bf1bac149ae1e3d1572fa9fa87d6431dbddc8b" Break @@ -17,9 +17,8 @@ switch ($cpu_arch) { $version = "1.10.2" $longPathFixed = $false $zip = Get-DownloadLocation "ninja-$version-win-x86.zip" - # TODO: Fix this QTQAINFRA-6296 - $internalUrl = "http://master.qt.io/development_releases/prebuilt/ninja/v$version/ninja-win-x86.zip" - $externalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\ninja\ninja-$version-win-really-x86.zip" + $internalUrl = "https://ci-files01-hki.ci.qt.io/input/ninja/ninja-$version-win-really-x86.zip" + $externalUrl = "http://master.qt.io/development_releases/prebuilt/ninja/v$version/ninja-win-x86.zip" $sha1 = "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca" Break } @@ -28,7 +27,7 @@ switch ($cpu_arch) { } } -Download $internalUrl $externalUrl $zip +Download $externalUrl $internalUrl $zip Verify-Checksum $zip $sha1 Extract-7Zip $zip C:\Utils\Ninja Remove "$zip"