actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-04 17:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

added pipx and yamllint

Browse Source
This commit is contained in:
Nikita Bykov
2020-10-08 16:57:24 +03:00
parent 7459f57aac
commit 48c3a310a5
11 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
images/win/Windows2016-Azure.json
View File

@@ -235,7 +235,6 @@
"{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
"{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1",
"{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1"
]
},
@@ -328,6 +327,13 @@
"{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
]
},
{
"type": "powershell",
"scripts": [
"{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
"{{ template_dir }}/scripts/Installers/Install-Pipx-Packages.ps1"
]
},
{
"type": "powershell",
"scripts": [

8
images/win/Windows2019-Azure.json
View File

@@ -249,7 +249,6 @@
"{{ template_dir }}/scripts/Installers/Install-PyPy.ps1",
"{{ template_dir }}/scripts/Installers/Install-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Configure-Toolset.ps1",
"{{ template_dir }}/scripts/Installers/Install-YAMLLint.ps1",
"{{ template_dir }}/scripts/Installers/Update-AndroidSDK.ps1",
"{{ template_dir }}/scripts/Installers/Install-AzureModules.ps1"
]
@@ -326,6 +325,13 @@
"{{ template_dir }}/scripts/Installers/Install-CodeQLBundle.ps1"
]
},
{
"type": "powershell",
"scripts": [
"{{ template_dir }}/scripts/Installers/Install-Pipx.ps1",
"{{ template_dir }}/scripts/Installers/Install-Pipx-Packages.ps1"
]
},
{
"type": "powershell",
"scripts": [

12
images/win/scripts/Installers/Install-Pipx-Packages.ps1 Normal file
View File

@@ -0,0 +1,12 @@
$pipxToolset = (Get-ToolsetContent).pipx
foreach($tool in $pipxToolset) {
if ($tool.python) {
$pythonPath = "${env:AGENT_TOOLSDIRECTORY}\Python\${tool.python}*\${env:AGENT_OSARCHITECTURE}\python-${tool.python}*"
Write-Host "Install ${tool.package} into python ${tool.python}"
pipx install $tool.package --python $python_path
} else {
Write-Host "Install ${tool.package} into default python"
pipx install $tool.package
}
Invoke-PesterTests -TestFile "PipxPackages" -TestName $tool.package
}

14
images/win/scripts/Installers/Install-Pipx.ps1 Normal file
View File

@@ -0,0 +1,14 @@
# Set custom directorys for pipx
$env:PIPX_BIN_DIR = "${env:ProgramFiles(x86)}\pipx_bin"
$env:PIPX_HOME = "${env:ProgramFiles(x86)}\pipx"
# Install pipx
pip install pipx
# Set environment variables
Add-MachinePathItem "${env:PIPX_BIN_DIR}"
Set-SystemVariable -SystemVariable PIPX_BIN_DIR -Value $env:PIPX_BIN_DIR
Set-SystemVariable -SystemVariable PIPX_HOME -Value $env:PIPX_HOME
# Test pipx
Invoke-PesterTests -TestFile "Tools" -TestName "Pipx"

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

@@ -1,3 +0,0 @@
pip install yamllint
Invoke-PesterTests -TestFile "Tools" -TestName "yamllint"

4
images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
View File

@@ -273,4 +273,8 @@ function Get-PacmanVersion {
function Get-YAMLLintVersion {
yamllint --version
}
function Get-PipxVersion {
pipx --version
}

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

@@ -59,7 +59,8 @@ $markdown += New-MDList -Style Unordered -Lines @(
(Get-RubyGemsVersion),
(Get-HelmVersion),
(Get-ComposerVersion),
(Get-NugetVersion)
(Get-NugetVersion),
(Get-PipxVersion)
)
$markdown += New-MDHeader "Project Management" -Level 3

5
images/win/scripts/Tests/PipxPackages.Test.ps1 Normal file
View File

@@ -0,0 +1,5 @@
Describe "yamllint" {
It "yamllint" {
"yamllint --version" | Should -ReturnZeroExitCode
}
}

12
images/win/scripts/Tests/Tools.Tests.ps1
View File

@@ -214,12 +214,6 @@ Describe "ServiceFabricSDK" {
}
}
Describe "yamllint" {
It "yamllint" {
"yamllint --version" | Should -ReturnZeroExitCode
}
}
Describe "Svn" {
It "svn" {
"svn --version --quiet" | Should -ReturnZeroExitCode
@@ -269,3 +263,9 @@ Describe "Zstd" {
"zstd -V" | Should -ReturnZeroExitCode
}
}
Describe "Pipx" {
It "Pipx" {
"pipx --version" | Should -ReturnZeroExitCode
}
}

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

@@ -236,5 +236,11 @@
"mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016",
"microsoft/aspnetcore-build:1.0-2.0"
]
}
},
"pipx": [
{
"package": "yamllint",
"cmd": "yamllint"
}
]
}

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

@@ -288,5 +288,11 @@
"mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019",
"microsoft/aspnetcore-build:1.0-2.0"
]
}
},
"pipx": [
{
"package": "yamllint",
"cmd": "yamllint"
}
]
}