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

Merge pull request #1658 from akv-platform/al-cheb/ubuntu-gcc10

Browse Source 
[Ubuntu] Add GCC 10
This commit is contained in:
Maxim Lobanov
2020-09-28 10:37:08 +03:00
committed by GitHub
parent e1bd620104 1f73bc3e70
commit fdd57d033b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -6,9 +6,8 @@ function Get-OSName {
function Get-CPPVersions { function Get-CPPVersions {
$cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { $cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object {
$_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null & $_.Split("/")[0] --version | Select-Object -First 1 | Take-OutputPart -Part 3
$Matches.version } | Sort-Object {[Version]$_}
}
return "GNU C++ " + ($cppVersions -Join ", ") return "GNU C++ " + ($cppVersions -Join ", ")
} }
@@ -16,7 +15,7 @@ function Get-FortranVersions {
$fortranVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object { $fortranVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object {
$_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null $_ -match "now (?<version>\d+\.\d+\.\d+)-" | Out-Null
$Matches.version $Matches.version
} } | Sort-Object {[Version]$_}
return "GNU Fortran " + ($fortranVersions -Join ", ") return "GNU Fortran " + ($fortranVersions -Join ", ")
} }
@@ -28,7 +27,7 @@ function Get-ClangVersions {
$_ -match "clang version (?<version>\d+\.\d+\.\d+)-" | Out-Null $_ -match "clang version (?<version>\d+\.\d+\.\d+)-" | Out-Null
$Matches.version $Matches.version
} }
} } | Sort-Object {[Version]$_}
return "Clang " + ($clangVersions -Join ", ") return "Clang " + ($clangVersions -Join ", ")
} }

11
images/linux/scripts/installers/gcc.sh
View File

@@ -4,6 +4,10 @@
## Desc: Installs GNU C++ ## Desc: Installs GNU C++
################################################################################ ################################################################################
set -e
# Source the helpers for use with the script
source $HELPER_SCRIPTS/os.sh
function InstallGcc { function InstallGcc {
version=$1 version=$1
@@ -29,7 +33,10 @@ versions=(
"g++-9" "g++-9"
) )
for version in ${versions[*]} if ! isUbuntu16; then
do versions+=("g++-10")
fi
for version in ${versions[*]}; do
InstallGcc $version InstallGcc $version
done done