Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MinGW on Windows 2022 #5729

Merged
merged 5 commits into from
Jun 16, 2022
Merged

Update MinGW on Windows 2022 #5729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47786be
Update MinGW on Windows 2022
abrown Jun 13, 2022
cb7a72f
Update MinGW documentation
abrown Jun 13, 2022
37b4cf3
Additionally update win-2016 version
abrown Jun 13, 2022
b797e5d
Revert "Update MinGW documentation"
abrown Jun 14, 2022
db4a3c7
fix: modify the pattern used for retrieving the MinGW version
abrown Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion images/win/scripts/Installers/Install-Mingw64.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
## Desc: Install GNU tools for Windows
################################################################################

Choco-Install -PackageName mingw -ArgumentList "--version=8.1.0"
$toolsetVersion = (Get-ToolsetContent).mingw.version
Choco-Install -PackageName mingw -ArgumentList "--version=$toolsetVersion"

# 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
Expand Down
4 changes: 2 additions & 2 deletions images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function Get-KindVersion {
}

function Get-MinGWVersion {
(gcc --version | Select-String -Pattern "MinGW-W64 project") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null
(gcc --version | Select-String -Pattern "MinGW-W64") -match "(?<version>\d+\.\d+\.\d+)" | Out-Null
$mingwVersion = $Matches.Version
return "Mingw-w64 $mingwVersion"
}
Expand Down Expand Up @@ -302,4 +302,4 @@ function Get-SwigVersion {
(swig -version | Out-String) -match "version (?<version>\d+\.\d+\.\d+)" | Out-Null
$swigVersion = $Matches.Version
return "Swig $swigVersion"
}
}
3 changes: 3 additions & 0 deletions images/win/toolsets/toolset-2016.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,9 @@
]
}
},
"mingw": {
"version": "8.1.0"
},
"MsysPackages": {
"msys2": [
"base-devel",
Expand Down
3 changes: 3 additions & 0 deletions images/win/toolsets/toolset-2019.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@
]
}
},
"mingw": {
"version": "8.1.0"
},
"MsysPackages": {
"msys2": [
"base-devel",
Expand Down
3 changes: 3 additions & 0 deletions images/win/toolsets/toolset-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@
]
}
},
"mingw": {
"version": "11.2.0.07112021"
},
"MsysPackages": {
"msys2": [],
"mingw": []
Expand Down