Add pipx and yamllint to report

This commit is contained in:
Vladimir Safonkin
2020-10-02 11:23:02 +03:00
parent a1f44e0d46
commit 6d325ba398
5 changed files with 14 additions and 22 deletions

View File

@@ -243,4 +243,8 @@ function Get-AptPackages {
$apt = $toolsetJson.apt $apt = $toolsetJson.apt
$pkgs = ($apt.common_packages + $apt.cmd_packages | Sort-Object) -join ", " $pkgs = ($apt.common_packages + $apt.cmd_packages | Sort-Object) -join ", "
return $pkgs return $pkgs
}
function Get-PipxVersion {
return "Pipx $(pipx --version 2> $null)"
} }

View File

@@ -58,6 +58,7 @@ $markdown += New-MDList -Style Unordered -Lines @(
(Get-YarnVersion), (Get-YarnVersion),
(Get-PipVersion), (Get-PipVersion),
(Get-Pip3Version), (Get-Pip3Version),
(Get-PipxVersion),
(Get-VcpkgVersion) (Get-VcpkgVersion)
) )
@@ -110,6 +111,7 @@ $toolsList = @(
(Get-TerraformVersion), (Get-TerraformVersion),
(Get-UnZipVersion), (Get-UnZipVersion),
(Get-WgetVersion), (Get-WgetVersion),
(Get-YamllintVersion),
(Get-ZipVersion), (Get-ZipVersion),
(Get-ZstdVersion) (Get-ZstdVersion)
) )

View File

@@ -269,4 +269,8 @@ function Get-RVersion {
function Get-SphinxVersion { function Get-SphinxVersion {
$sphinxVersion = searchd -h | Select-Object -First 1 | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-" $sphinxVersion = searchd -h | Select-Object -First 1 | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
return "Sphinx Open Source Search Server $sphinxVersion" return "Sphinx Open Source Search Server $sphinxVersion"
}
function Get-YamllintVersion {
return (yamllint --version | Out-String)
} }

View File

@@ -208,7 +208,8 @@
"{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh",
"{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/pypy.sh",
"{{template_dir}}/scripts/installers/python.sh", "{{template_dir}}/scripts/installers/python.sh",
"{{template_dir}}/scripts/installers/test-toolcache.sh" "{{template_dir}}/scripts/installers/test-toolcache.sh",
"{{template_dir}}/scripts/installers/pipx-packages.sh"
], ],
"environment_vars": [ "environment_vars": [
"HELPER_SCRIPTS={{user `helper_script_folder`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}",
@@ -231,16 +232,6 @@
], ],
"execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
}, },
{
"type": "shell",
"scripts": [
"{{template_dir}}/scripts/installers/aws-sam-cli.sh"
],
"environment_vars": [
"HELPER_SCRIPTS={{user `helper_script_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{ {
"type": "shell", "type": "shell",
"scripts": [ "scripts": [

View File

@@ -214,7 +214,8 @@
"{{template_dir}}/scripts/installers/hosted-tool-cache.sh", "{{template_dir}}/scripts/installers/hosted-tool-cache.sh",
"{{template_dir}}/scripts/installers/pypy.sh", "{{template_dir}}/scripts/installers/pypy.sh",
"{{template_dir}}/scripts/installers/python.sh", "{{template_dir}}/scripts/installers/python.sh",
"{{template_dir}}/scripts/installers/test-toolcache.sh" "{{template_dir}}/scripts/installers/test-toolcache.sh",
"{{template_dir}}/scripts/installers/pipx-packages.sh"
], ],
"environment_vars": [ "environment_vars": [
"HELPER_SCRIPTS={{user `helper_script_folder`}}", "HELPER_SCRIPTS={{user `helper_script_folder`}}",
@@ -237,16 +238,6 @@
], ],
"execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
}, },
{
"type": "shell",
"scripts": [
"{{template_dir}}/scripts/installers/aws-sam-cli.sh"
],
"environment_vars": [
"HELPER_SCRIPTS={{user `helper_script_folder`}}"
],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
},
{ {
"type": "shell", "type": "shell",
"scripts": [ "scripts": [