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

Add clang-tidy to Ubuntu images (#5541)

Browse Source
This commit is contained in:
juliancarrivick
2022-05-23 21:50:28 +08:00
committed by GitHub
parent f8f8c93509
commit 64e497aba9
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,14 +24,15 @@ function Get-ClangToolVersions {
param ( param (
[Parameter(Mandatory = $true)] [Parameter(Mandatory = $true)]
[string] $ToolName, [string] $ToolName,
[string] $VersionLineMatcher = "${ToolName} version",
[string] $VersionPattern = "\d+\.\d+\.\d+)-" [string] $VersionPattern = "\d+\.\d+\.\d+)-"
) )
$result = Get-CommandResult "apt list --installed" -Multiline $result = Get-CommandResult "apt list --installed" -Multiline
$toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\d+"} | ForEach-Object { $toolVersions = $result.Output | Where-Object { $_ -match "^${ToolName}-\d+"} | ForEach-Object {
$clangCommand = ($_ -Split "/")[0] $clangCommand = ($_ -Split "/")[0]
Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${ToolName} version" } | ForEach-Object { Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "${VersionLineMatcher}" } | ForEach-Object {
$_ -match "${ToolName} version (?<version>${VersionPattern}" | Out-Null $_ -match "${VersionLineMatcher} (?<version>${VersionPattern}" | Out-Null
$Matches.version $Matches.version
} }
} | Sort-Object {[Version]$_} } | Sort-Object {[Version]$_}
@@ -41,12 +42,17 @@ function Get-ClangToolVersions {
function Get-ClangVersions { function Get-ClangVersions {
$clangVersions = Get-ClangToolVersions -ToolName "clang" $clangVersions = Get-ClangToolVersions -ToolName "clang"
return "Clang " + $clangVersions return "Clang $clangVersions"
} }
function Get-ClangFormatVersions { function Get-ClangFormatVersions {
$clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format" $clangFormatVersions = Get-ClangToolVersions -ToolName "clang-format"
return "Clang-format " + $clangFormatVersions return "Clang-format $clangFormatVersions"
}
function Get-ClangTidyVersions {
$clangFormatVersions = Get-ClangToolVersions -ToolName "clang-tidy" -VersionLineMatcher "LLVM version" -VersionPattern "\d+\.\d+\.\d+)"
return "Clang-tidy $clangFormatVersions"
} }

3
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -48,7 +48,8 @@ $runtimesList = @(
(Get-RubyVersion), (Get-RubyVersion),
(Get-JuliaVersion), (Get-JuliaVersion),
(Get-ClangVersions), (Get-ClangVersions),
(Get-ClangFormatVersions) (Get-ClangFormatVersions),
(Get-ClangTidyVersions)
) )
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) { if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {

4
images/linux/scripts/installers/clang.sh
View File

@@ -11,7 +11,7 @@ function InstallClang {
local version=$1 local version=$1
echo "Installing clang-$version..." echo "Installing clang-$version..."
apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" apt-get install -y "clang-$version" "lldb-$version" "lld-$version" "clang-format-$version" "clang-tidy-$version"
} }
function SetDefaultClang { function SetDefaultClang {
@@ -21,6 +21,8 @@ function SetDefaultClang {
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${version} 100 update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${version} 100
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${version} 100 update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${version} 100
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${version} 100 update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${version} 100
update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-${version} 100
update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/bin/run-clang-tidy-${version} 100
} }
versions=$(get_toolset_value '.clang.versions[]') versions=$(get_toolset_value '.clang.versions[]')

3
images/linux/scripts/tests/Tools.Tests.ps1
View File

@@ -120,6 +120,9 @@ Describe "clang" {
"clang-$ClangVersion --version" | Should -ReturnZeroExitCode "clang-$ClangVersion --version" | Should -ReturnZeroExitCode
"clang++-$ClangVersion --version" | Should -ReturnZeroExitCode "clang++-$ClangVersion --version" | Should -ReturnZeroExitCode
"clang-format-$ClangVersion --version" | Should -ReturnZeroExitCode
"clang-tidy-$ClangVersion --version" | Should -ReturnZeroExitCode
"run-clang-tidy-$ClangVersion --help" | Should -ReturnZeroExitCode
} }
} }