From 82ecf74768c676416d7fdf70b60addcaf1673cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 10 Feb 2022 08:15:07 +0200 Subject: [PATCH] Update llvm-mingw to version 13.0.0 When Windows 10 and 11 were updated, this was missing Task-number: QTQAINFRA-4593 Change-Id: I52c920a5fc791db2039469f2931fa6c941f67e1e Reviewed-by: Oliver Wolff Reviewed-by: Ville-Pekka Karhu --- .../25-llvm-mingw.ps1 | 18 ++++++------------ .../25-llvm-mingw.ps1 | 18 ++++++------------ 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1 index cf730147..0bf07481 100644 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1 +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1 @@ -41,21 +41,15 @@ # This script installs LLVM-Mingw by mstorsjo -$zip = Get-DownloadLocation "llvm-mingw-20210423-ucrt-x86_64.zip" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20210423-ucrt-x86_64.zip" -$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-ucrt-x86_64.zip" +$zip = Get-DownloadLocation "llvm-mingw-20211002-ucrt-x86_64.zip" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20211002-ucrt-x86_64.zip" +$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20211002/llvm-mingw-20211002-ucrt-x86_64.zip" Download $url_official $url_cache $zip -Verify-Checksum $zip "da9fb1e4a74747b6c410240cec0d488e428fd338" +Verify-Checksum $zip "69907fa281552f795f28438ab69f8c7032c8d20e" Extract-7Zip $zip C:\ -Rename-Item C:\llvm-mingw-20210423-ucrt-x86_64 C:\llvm-mingw +Rename-Item C:\llvm-mingw-20211002-ucrt-x86_64 C:\llvm-mingw -# Due to https://github.com/mstorsjo/llvm-mingw/issues/199 -Remove-Item C:\llvm-mingw\aarch64-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\x86_64-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\armv7-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\i686-w64-mingw32\lib\libc++.dll.a - -Write-Output "llvm-mingw = 12" >> ~/versions.txt +Write-Output "llvm-mingw = 13.0.0" >> ~/versions.txt Remove-Item -Path $zip diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1 index cf730147..0bf07481 100644 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1 +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1 @@ -41,21 +41,15 @@ # This script installs LLVM-Mingw by mstorsjo -$zip = Get-DownloadLocation "llvm-mingw-20210423-ucrt-x86_64.zip" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20210423-ucrt-x86_64.zip" -$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-ucrt-x86_64.zip" +$zip = Get-DownloadLocation "llvm-mingw-20211002-ucrt-x86_64.zip" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20211002-ucrt-x86_64.zip" +$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20211002/llvm-mingw-20211002-ucrt-x86_64.zip" Download $url_official $url_cache $zip -Verify-Checksum $zip "da9fb1e4a74747b6c410240cec0d488e428fd338" +Verify-Checksum $zip "69907fa281552f795f28438ab69f8c7032c8d20e" Extract-7Zip $zip C:\ -Rename-Item C:\llvm-mingw-20210423-ucrt-x86_64 C:\llvm-mingw +Rename-Item C:\llvm-mingw-20211002-ucrt-x86_64 C:\llvm-mingw -# Due to https://github.com/mstorsjo/llvm-mingw/issues/199 -Remove-Item C:\llvm-mingw\aarch64-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\x86_64-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\armv7-w64-mingw32\lib\libc++.dll.a -Remove-Item C:\llvm-mingw\i686-w64-mingw32\lib\libc++.dll.a - -Write-Output "llvm-mingw = 12" >> ~/versions.txt +Write-Output "llvm-mingw = 13.0.0" >> ~/versions.txt Remove-Item -Path $zip