actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-19 08:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update MinGW on Windows 2022 (#5729)

Browse Source 
* Update MinGW on Windows 2022

Previously, the GitHub virtual environments only had MinGW v8.1.0
installed. That version was released in October of 2018 and, since then,
MinGW has released versions all the way up to v11.2.0. This change
updates the MinGW version to the latest available on Chocolatey for the
Windows 2022 environment. Windows 2019 retains the current v8.1.0
version. Fixes #5530.

* Update MinGW documentation

* Additionally update win-2016 version

* Revert "Update MinGW documentation"

This reverts commit cb7a72ff0f.

* fix: modify the pattern used for retrieving the MinGW version
This commit is contained in:
Andrew Brown
2022-06-16 08:15:38 -07:00
committed by GitHub
parent 70cbad1d25
commit 89ee433676
5 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/win/scripts/Installers/Install-Mingw64.ps1
View File

@@ -3,7 +3,8 @@
## Desc: Install GNU tools for Windows ## 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 # 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 # and so the same command line can be used on Windows as on macOS and Linux

2
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -102,7 +102,7 @@ function Get-KindVersion {
} }
function Get-MinGWVersion { 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 $mingwVersion = $Matches.Version
return "Mingw-w64 $mingwVersion" return "Mingw-w64 $mingwVersion"
} }

3
images/win/toolsets/toolset-2016.json
View File

@@ -187,6 +187,9 @@
] ]
} }
}, },
"mingw": {
"version": "8.1.0"
},
"MsysPackages": { "MsysPackages": {
"msys2": [ "msys2": [
"base-devel", "base-devel",

3
images/win/toolsets/toolset-2019.json
View File

@@ -189,6 +189,9 @@
] ]
} }
}, },
"mingw": {
"version": "8.1.0"
},
"MsysPackages": { "MsysPackages": {
"msys2": [ "msys2": [
"base-devel", "base-devel",

3
images/win/toolsets/toolset-2022.json
View File

@@ -159,6 +159,9 @@
] ]
} }
}, },
"mingw": {
"version": "11.2.0.07112021"
},
"MsysPackages": { "MsysPackages": {
"msys2": [], "msys2": [],
"mingw": [] "mingw": []