actions/runner-images-sangeeth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Mingw-w64 (#893)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2020-05-19 13:16:59 +03:00
committed by GitHub
parent 8632288097
commit a12a3b7042
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/win/Windows2016-Azure.json
+2 -2
View File
@@ -547,7 +547,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
] ]
}, },
{ {
@@ -861,7 +861,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" "{{ template_dir }}/scripts/Installers/Validate-Mingw64.ps1"
] ]
}, },
{ {
images/win/Windows2019-Azure.json
+2 -2
View File
@@ -526,7 +526,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Install-MinGW.ps1" "{{ template_dir }}/scripts/Installers/Install-Mingw64.ps1"
] ]
}, },
{ {
@@ -846,7 +846,7 @@
{ {
"type": "powershell", "type": "powershell",
"scripts":[ "scripts":[
"{{ template_dir }}/scripts/Installers/Validate-MinGW.ps1" "{{ template_dir }}/scripts/Installers/Validate-Mingw64.ps1"
] ]
}, },
{ {
images/win/scripts/Installers/Install-MinGW.ps1 → images/win/scripts/Installers/Install-Mingw64.ps1
+1 -1
View File
@@ -1,5 +1,5 @@
################################################################################ ################################################################################
## File: Install-MinGW.ps1 ## File: Install-Mingw64.ps1
## Desc: Install GNU tools for Windows to C:\tools\mingw64 ## Desc: Install GNU tools for Windows to C:\tools\mingw64
################################################################################ ################################################################################
images/win/scripts/Installers/Validate-MinGW.ps1 → images/win/scripts/Installers/Validate-Mingw64.ps1
+7 -7
View File
@@ -1,6 +1,6 @@
################################################################################ ################################################################################
## File: Validate-MinGW.ps1 ## File: Validate-Mingw64.ps1
## Desc: Validate MinGW ## Desc: Validate Mingw64
################################################################################ ################################################################################
if (Get-Command -Name 'gcc') if (Get-Command -Name 'gcc')
@@ -39,19 +39,19 @@ else
# Adding description of the software to Markdown # Adding description of the software to Markdown
# `gcc --version` gives output like: # `gcc --version` gives output like:
# gcc.exe (x86_64-posix-seh-rev0, Built by MinGW-W64 project) 5.3.0 # gcc.exe (x86_64-posix-seh-rev0, Built by Mingw-w64 project) 5.3.0
# Copyright (C) 2015 Free Software Foundation, Inc. # Copyright (C) 2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO # This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$SoftwareName = "MinGW" $SoftwareName = "Mingw-w64"
$(gcc --version).Split([System.Environment]::NewLine)[0] -match "\d\.\d\.\d$" $(gcc --version).Split([System.Environment]::NewLine)[0] -match "\d\.\d\.\d$"
$minGwVersion = $matches[0] $mingw64Version = $matches[0]
$Description = @" $Description = @"
_Version:_ $minGwVersion<br/> _Version:_ $mingw64Version<br/>
_Environment:_ _Environment:_
* PATH: contains location of the MinGW 'bin' directory * PATH: contains location of the Mingw-w64 'bin' directory
"@ "@
Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description Add-SoftwareDetailsToMarkdown -SoftwareName $SoftwareName -DescriptionMarkdown $Description