From ddf40964b55a65010099ea11f0f1ab0921128970 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 13 Jan 2021 10:46:58 +0300 Subject: [PATCH] install the latest version --- images/win/scripts/Installers/Install-Mingw64.ps1 | 5 ----- images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 | 2 +- images/win/scripts/Tests/Tools.Tests.ps1 | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/images/win/scripts/Installers/Install-Mingw64.ps1 b/images/win/scripts/Installers/Install-Mingw64.ps1 index b6c860485..32f26292d 100644 --- a/images/win/scripts/Installers/Install-Mingw64.ps1 +++ b/images/win/scripts/Installers/Install-Mingw64.ps1 @@ -5,9 +5,4 @@ Choco-Install -PackageName mingw -# Make a copy of mingw32-make.exe to make.exe, which is a more discoverable name -# and so the same command line can be used on Windows as on macOS and Linux -$path = where.exe mingw32-make.exe | Get-Item -Copy-Item -Path $path -Destination (Join-Path $path.Directory 'make.exe') - Invoke-PesterTests -TestFile "Tools" -TestName "Mingw64" diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 690f36764..4edf3eeca 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -83,7 +83,7 @@ function Get-KindVersion { } function Get-MinGWVersion { - (gcc --version | Select-String -Pattern "MinGW-W64 project") -match "(?\d+\.\d+\.\d+)" | Out-Null + (gcc --version | Select-String -Pattern "GCC") -match "(?\d+\.\d+\.\d+)" | Out-Null $mingwVersion = $Matches.Version return "Mingw-w64 $mingwVersion" } diff --git a/images/win/scripts/Tests/Tools.Tests.ps1 b/images/win/scripts/Tests/Tools.Tests.ps1 index a00245321..e858b7325 100644 --- a/images/win/scripts/Tests/Tools.Tests.ps1 +++ b/images/win/scripts/Tests/Tools.Tests.ps1 @@ -127,7 +127,6 @@ Describe "Mingw64" { It "" -TestCases @( @{ ToolName = "gcc" } @{ ToolName = "g++" } - @{ ToolName = "make" } ) { "$ToolName --version" | Should -ReturnZeroExitCode }