actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Install PyPy from official site instead of NPM for Windows (#873)

Browse Source 
* install PyPy from official repo
This commit is contained in:
Aleksandr Chebotov
2020-05-18 11:08:06 +03:00
committed by GitHub
parent 47c7968b9d
commit 3f4ad2f912
10 changed files with 172 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
images/win/scripts/Installers/Validate-Toolset.ps1
View File

@@ -63,8 +63,9 @@ Import-Module -Name ImageHelpers -Force
# Define executables for cached tools
$toolsExecutables = @{
Python = @("python.exe", "Scripts\pip.exe");
Python = @("python.exe", "Scripts\pip.exe")
node = @("node.exe", "npm")
PyPy = @("python.exe", "Scripts\pip.exe")
}
# Get toolcache content from toolset
@@ -78,6 +79,11 @@ foreach($tool in $tools) {
$toolExecs = $toolsExecutables[$tool.name]
foreach ($version in $tool.versions) {
# Add wildcard if missing
if (-not $version.Contains('*')) {
$version += '.*'
}
# Check if version folder exists
$expectedVersionPath = Join-Path $toolPath $version
if (-not (Test-Path $expectedVersionPath)) {
@@ -100,8 +106,14 @@ foreach($tool in $tools) {
Write-Host "Run validation test for $($tool.name)($($tool.arch)) $($foundVersion.name) executables..."
Run-ExecutableTests -Executables $toolExecs -ToolPath $foundVersionArchPath
$foundVersionName = $foundVersion.name
if ($tool.name -eq 'PyPy')
{
$pypyVersion = & "$foundVersionArchPath\python.exe" -c "import sys;print(sys.version.split('\n')[1])"
$foundVersionName = "{0} {1}" -f $foundVersionName, $pypyVersion
}
# Add to tool version to markdown
$markdownDescription += "_Version:_ $($foundVersion.name)<br/>"
$markdownDescription += "_Version:_ $foundVersionName<br/>"
}
# Create markdown description for system default tool