Skip to content

Commit fcac2f3

Browse files
MariusStorhaugMariusStorhaug
authored
Merge branch 'main' into docs/version-input-accepts-nuget-range
2 parents fee5c4a + 4d633e4 commit fcac2f3

3 files changed

Lines changed: 113 additions & 9 deletions

File tree

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ customize rule selection, severity filtering, and custom rule inclusion.
2121
| `SettingsFilePath` | The path to the settings file. | false | `.github/linters/.powershell-psscriptanalyzer.psd1` |
2222
| `Debug` | Enable debug output. | false | `'false'` |
2323
| `Verbose` | Enable verbose output. | false | `'false'` |
24-
| `Version` | Specifies the exact version of the GitHub module to install. | false | |
25-
| `Prerelease` | Allow prerelease versions if available. | false | `'false'` |
24+
| `Version` | Specifies the version of the PSScriptAnalyzer module to install (NuGet range). | false | |
25+
| `Prerelease` | Allow prerelease versions of the PSScriptAnalyzer module if available. | false | `'false'` |
26+
| `PesterVersion` | Specifies the version of the Pester module to install (NuGet range). | false | |
27+
| `PesterPrerelease` | Allow prerelease versions of the Pester module if available. | false | `'false'` |
28+
| `GitHubVersion` | Specifies the version of the GitHub module to install (NuGet range). | false | |
29+
| `GitHubPrerelease` | Allow prerelease versions of the GitHub module if available. | false | `'false'` |
2630
| `WorkingDirectory` | The working directory where the script runs. | false | `'.'` |
2731
| `ReportAsJson` | Output generated reports in JSON format in addition to the configured format. | false | `'true'` |
2832
| `Notice_Mode` | Controls when to show notices for test completion. | false | `'Failed'` |

‎action.yml‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,30 @@ inputs:
2222
required: false
2323
default: 'false'
2424
Version:
25-
description: Specifies the version of the GitHub module to be installed. Accepts an exact version or a NuGet version range (for example '[1.2.0, 2.0.0)').
25+
description: |
26+
Specifies the version of the PSScriptAnalyzer module to install, using NuGet version-range syntax (for example '[1.0.0, 2.0.0)').
27+
When empty, the latest available version is installed.
2628
required: false
2729
Prerelease:
28-
description: Allow prerelease versions if available.
30+
description: Allow prerelease versions of the PSScriptAnalyzer module if available.
31+
required: false
32+
default: 'false'
33+
PesterVersion:
34+
description: |
35+
Specifies the version of the Pester module to install, using NuGet version-range syntax (for example '[6.0.0,7.0.0)').
36+
When empty, the latest available version is installed.
37+
required: false
38+
PesterPrerelease:
39+
description: Allow prerelease versions of the Pester module if available.
40+
required: false
41+
default: 'false'
42+
GitHubVersion:
43+
description: |
44+
Specifies the version of the GitHub module to install, using NuGet version-range syntax (for example '[1.2.0, 2.0.0)').
45+
When empty, the latest available version is installed.
46+
required: false
47+
GitHubPrerelease:
48+
description: Allow prerelease versions of the GitHub module if available.
2949
required: false
3050
default: 'false'
3151
WorkingDirectory:
@@ -255,24 +275,29 @@ runs:
255275
PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_SettingsFilePath: ${{ inputs.SettingsFilePath }}
256276
with:
257277
Debug: ${{ inputs.Debug }}
258-
Prerelease: ${{ inputs.Prerelease }}
278+
Prerelease: ${{ inputs.GitHubPrerelease }}
259279
Verbose: ${{ inputs.Verbose }}
260-
Version: ${{ inputs.Version }}
280+
Version: ${{ inputs.GitHubVersion }}
261281
WorkingDirectory: ${{ inputs.WorkingDirectory }}
262282
Script: ${{ github.action_path }}/src/main.ps1
263283

264284
- name: Invoke-Pester
265-
uses: PSModule/Invoke-Pester@abddf7bef0d0614d7ca322036af6a06ee0fb4d44 # v4.2.4
285+
uses: PSModule/Invoke-Pester@4ff33199141fdf22568990b6107fe3148ae93a1c # v5.1.0
266286
id: test
267287
env:
268288
SettingsFilePath: ${{ fromJson(steps.paths.outputs.result).SettingsFilePath }}
289+
PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_Version: ${{ inputs.Version }}
290+
PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_Prerelease: ${{ inputs.Prerelease }}
269291
with:
270292
Debug: ${{ inputs.Debug }}
271-
Prerelease: ${{ inputs.Prerelease }}
293+
GitHubPrerelease: ${{ inputs.GitHubPrerelease }}
294+
GitHubVersion: ${{ inputs.GitHubVersion }}
295+
Prerelease: ${{ inputs.PesterPrerelease }}
272296
Verbose: ${{ inputs.Verbose }}
273-
Version: ${{ inputs.Version }}
297+
Version: ${{ inputs.PesterVersion }}
274298
WorkingDirectory: ${{ inputs.WorkingDirectory }}
275299
TestResult_TestSuiteName: ${{ inputs.TestResult_TestSuiteName }}
300+
Prescript: ${{ github.action_path }}/src/Install-PSScriptAnalyzer.ps1
276301
Path: ${{ github.action_path }}/src/tests/PSScriptAnalyzer
277302
Run_Path: ${{ fromJson(steps.paths.outputs.result).CodePath }}
278303
ReportAsJson: ${{ inputs.ReportAsJson }}

‎src/Install-PSScriptAnalyzer.ps1‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<#
2+
.SYNOPSIS
3+
Ensures the requested PSScriptAnalyzer version is the only one installed and loaded.
4+
5+
.DESCRIPTION
6+
Runs as the Invoke-Pester prescript, in the same process as the analyzer test run. It installs the
7+
PSScriptAnalyzer version selected through the action's Version/Prerelease inputs (retrying transient
8+
PSGallery failures), removes any other PSScriptAnalyzer version from the session, and imports the chosen
9+
version into the global session state. This guarantees the tests use the selected version instead of
10+
PowerShell auto-loading whatever copy happens to be preinstalled on the runner.
11+
#>
12+
13+
[CmdletBinding()]
14+
param()
15+
16+
$moduleName = 'PSScriptAnalyzer'
17+
$version = $env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_Version
18+
$prerelease = $env:PSMODULE_INVOKE_SCRIPTANALYZER_INPUT_Prerelease -eq 'true'
19+
20+
$installParams = @{
21+
Name = $moduleName
22+
Repository = 'PSGallery'
23+
TrustRepository = $true
24+
PassThru = $true
25+
WarningAction = 'SilentlyContinue'
26+
}
27+
if (-not [string]::IsNullOrWhiteSpace($version)) {
28+
$installParams['Version'] = $version
29+
}
30+
if ($prerelease) {
31+
$installParams['Prerelease'] = $true
32+
}
33+
34+
$label = [string]::IsNullOrWhiteSpace($version) ? $moduleName : "$moduleName $version"
35+
Write-Host "Installing module: $label"
36+
37+
$installed = $null
38+
$retryCount = 5
39+
$retryDelay = 10
40+
for ($i = 0; $i -lt $retryCount; $i++) {
41+
try {
42+
$installed = Install-PSResource @installParams
43+
break
44+
} catch {
45+
Write-Warning "Installation of $moduleName failed with error: $_"
46+
if ($i -eq $retryCount - 1) {
47+
throw
48+
}
49+
Write-Warning "Retrying in $retryDelay seconds..."
50+
Start-Sleep -Seconds $retryDelay
51+
}
52+
}
53+
54+
# Resolve the exact version to load. Prefer what was just installed; if the resource was already
55+
# present, Install-PSResource returns nothing, so fall back to the newest installed version that
56+
# satisfies the requested constraint.
57+
$resolved = $installed | Where-Object { $_.Name -eq $moduleName } | Sort-Object Version -Descending | Select-Object -First 1
58+
if (-not $resolved) {
59+
$getParams = @{ Name = $moduleName; Verbose = $false; ErrorAction = 'SilentlyContinue' }
60+
if (-not [string]::IsNullOrWhiteSpace($version)) {
61+
$getParams['Version'] = $version
62+
}
63+
$resolved = Get-InstalledPSResource @getParams | Sort-Object Version -Descending | Select-Object -First 1
64+
}
65+
if (-not $resolved) {
66+
throw "No installed '$moduleName' version satisfies constraint '$version'."
67+
}
68+
69+
# Remove any already-loaded versions so only the chosen one remains, then import that exact version
70+
# into the global session state used by the Pester run.
71+
Write-Host "Removing any loaded '$moduleName' module from the session"
72+
Remove-Module -Name $moduleName -Force -ErrorAction SilentlyContinue
73+
74+
Write-Host "Importing module: $moduleName $($resolved.Version)"
75+
Import-Module -Name $moduleName -RequiredVersion $resolved.Version -Force -Global

0 commit comments

Comments
 (0)