actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-11 05:02:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu, Windows] Add Azure modules to PS scope; deprecate zip (#13482)

Browse Source
This commit is contained in:
Erik Bershel
2026-01-09 11:03:49 +01:00
committed by GitHub
parent d9f2f12ea8
commit dce2b21f0a
9 changed files with 7 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
images/ubuntu/scripts/build/Install-PowerShellAzModules.ps1
View File

@@ -11,6 +11,7 @@ Import-Module "$env:HELPER_SCRIPTS/../tests/Helpers.psm1"
# Get modules content from toolset
$modules = (Get-ToolsetContent).azureModules
$installPSModulePath = "/usr/share"
$psModuleMachinePath = $env:PSModulePath + ":"
foreach ($module in $modules) {
$moduleName = $module.name
@@ -19,9 +20,12 @@ foreach ($module in $modules) {
foreach ($version in $module.versions) {
$modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}"
Write-Host " - $version [$modulePath]"
$psModuleMachinePath += ($modulePath + ":")
Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force
}
}
$finalLine = "PSModulePath=$($psModuleMachinePath.TrimEnd(':').Replace("\root", '$HOME'))"
Add-Content -Path "/etc/environment" -Value $finalLine
Invoke-PesterTests -TestFile "PowerShellModules" -TestName "AzureModules"

5
images/ubuntu/scripts/docs-gen/SoftwareReport.Common.psm1
View File

@@ -266,11 +266,6 @@ function Get-PowerShellModules {
$result += [ToolVersionsListNode]::new("Az", $azureInstalledModules, "^\d+\.\d+", "Inline")
}
[Array] $azureCachedModules = Get-ChildItem /usr/share/az_*.zip -File | ForEach-Object { $_.Name.Split("_")[1] }
if ($azureCachedModules.Count -gt 0) {
$result += [ToolVersionsListNode]::new("Az (Cached)", $azureCachedModules, "^\d+\.\d+", "Inline")
}
(Get-ToolsetContent).powershellModules.name | ForEach-Object {
$moduleName = $_
$moduleVersions = Get-Module -Name $moduleName -ListAvailable | Select-Object -ExpandProperty Version | Sort-Object -Unique

9
images/ubuntu/scripts/tests/PowerShellModules.Tests.ps1
View File

@@ -50,15 +50,6 @@ Describe "AzureModules" {
$moduleVersion | Should -Match $expectedVersion
}
}
if ($module.default) {
$moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default }
It "<moduleDefault> set as default" -TestCases $moduleInfo {
$moduleVersion = (Get-Module -ListAvailable -Name $moduleName).Version.ToString()
$moduleVersion | Should -Match $moduleDefault
}
}
}
}
}

14
images/windows/scripts/build/Install-PowershellAzModules.ps1
View File

@@ -26,20 +26,6 @@ foreach ($module in $modules) {
$psModuleMachinePath += "$modulePath;"
Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop
}
foreach ($version in $module.zip_versions) {
$modulePath = Join-Path -Path $installPSModulePath -ChildPath "${moduleName}_${version}"
Save-Module -Path $modulePath -Name $moduleName -RequiredVersion $version -Force -ErrorAction Stop
Compress-Archive -Path $modulePath -DestinationPath "${modulePath}.zip"
Remove-Item $modulePath -Recurse -Force
}
# Append default tool version to machine path
if ($null -ne $module.default) {
$defaultVersion = $module.default
Write-Host "Use ${moduleName} ${defaultVersion} as default version..."
$psModuleMachinePath += "${installPSModulePath}\${moduleName}_${defaultVersion};"
}
}
# Add modules to the PSModulePath

17
images/windows/scripts/docs-gen/SoftwareReport.Common.psm1
View File

@@ -213,7 +213,7 @@ function Get-DotnetFrameworkVersions {
function Get-PowerShellAzureModules {
[Array] $result = @()
$defaultAzureModuleVersion = "2.1.0"
$defaultAzureModuleVersion = "12.5.0"
[Array] $azInstalledModules = Get-ChildItem -Path "C:\Modules\az_*" -Directory | ForEach-Object { $_.Name.Split("_")[1] }
if ($azInstalledModules.Count -gt 0) {
@@ -230,21 +230,6 @@ function Get-PowerShellAzureModules {
$result += [ToolVersionsListNode]::new("AzureRM", $($azurermInstalledModules), '^\d+\.\d+', "Inline")
}
[Array] $azCachedModules = Get-ChildItem -Path "C:\Modules\az_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] }
if ($azCachedModules.Count -gt 0) {
$result += [ToolVersionsListNode]::new("Az (Cached)", $($azCachedModules), '^\d+\.\d+', "Inline")
}
[Array] $azureCachedModules = Get-ChildItem -Path "C:\Modules\azure_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] }
if ($azureCachedModules.Count -gt 0) {
$result += [ToolVersionsListNode]::new("Azure (Cached)", $($azureCachedModules), '^\d+\.\d+', "Inline")
}
[Array] $azurermCachedModules = Get-ChildItem -Path "C:\Modules\azurerm_*.zip" -File | ForEach-Object { $_.Name.Split("_")[1] }
if ($azurermCachedModules.Count -gt 0) {
$result += [ToolVersionsListNode]::new("AzureRM (Cached)", $($azurermCachedModules), '^\d+\.\d+', "Inline")
}
return $result
}

8
images/windows/scripts/tests/PowerShellAzModules.Tests.ps1
View File

@@ -27,14 +27,6 @@ Describe "AzureModules" {
$moduleVersion | Should -Match $expectedVersion
}
}
if ($module.default) {
$moduleInfo = @{ moduleName = $moduleName; moduleDefault = $module.default }
It "<moduleDefault> set as default" -TestCases $moduleInfo {
$moduleVersions = Get-Module -ListAvailable -Name $moduleName | ForEach-Object { $_.Version.ToString() }
$moduleVersions | Should -Contain $moduleDefault
}
}
}
}
}

2
images/windows/toolsets/toolset-2019.json
View File

@@ -94,8 +94,6 @@
"name": "az",
"versions": [
"12.5.0"
],
"zip_versions": [
]
}
],

3
images/windows/toolsets/toolset-2022.json
View File

@@ -91,9 +91,6 @@
"name": "az",
"versions": [
"12.5.0"
],
"zip_versions": [
]
}
],

3
images/windows/toolsets/toolset-2025.json
View File

@@ -76,8 +76,7 @@
"name": "az",
"versions": [
"12.5.0"
],
"zip_versions": []
]
}
],
"java": {