Skip to content

Commit d6210f8

Browse files
JaykulJaykul
committed
Explicitly add a Windows PowerShell job to the build matrix.
There are people still using this there.
1 parent e2b1d8d commit d6210f8

7 files changed

Lines changed: 58 additions & 55 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ jobs:
7070
fail-fast: false
7171
matrix:
7272
os: [ windows-latest, ubuntu-latest, macos-latest ]
73+
shell: [ pwsh ]
74+
include:
75+
- os: windows-latest
76+
shell: powershell
7377
steps:
7478
- name: Download build.requires.psd1
7579
uses: actions/download-artifact@v8
@@ -79,39 +83,37 @@ jobs:
7983
uses: actions/download-artifact@v8
8084
with:
8185
name: ModuleBuilder
82-
path: output/ModuleBuilder # /home/runner/work/ModuleBuilder/ModuleBuilder/output/ModuleBuilder
86+
path: Modules/ModuleBuilder # /home/runner/work/ModuleBuilder/ModuleBuilder/output/ModuleBuilder
8387
- name: Download Pester Tests
8488
uses: actions/download-artifact@v8
8589
with:
8690
name: PesterTests
8791
path: PesterTests
8892
- name: Install Output Modules
8993
shell: pwsh
94+
env:
95+
MODULEFAST_DESTINATION: ${{ github.workspace }}/Modules
9096
run: | # PowerShell
91-
# https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-powershell#powershell-module-locations
92-
$ModuleDestination = if ($IsWindows) {
93-
Join-Path ([Environment]::GetFolderPath('MyDocuments')) 'PowerShell/Modules'
94-
} else {
95-
Join-Path $HOME '.local/share/powershell/Modules'
96-
}
97-
98-
Get-ChildItem -Directory output -OutVariable Modules
99-
| Move-Item -Destination { Join-Path $ModuleDestination $_.Name } -Force
100-
101-
Write-Host "Installing $($Modules -join ', ') to $ModuleDestination"
102-
Get-ChildItem -Directory $ModuleDestination
103-
Write-Host "PSModulePath:"
104-
$Env:PSModulePath -split ([IO.Path]::PathSeparator) | Out-Host
97+
$Env:PSModulePath = $Env:MODULEFAST_DESTINATION + [IO.Path]::PathSeparator + $Env:PSModulePath
98+
# Just to prove that I can...
99+
Import-Module ModuleBuilder -Force -Global -PassThru | Out-Host
105100
106101
# Avoid installing ModuleBuilder with ModuleFast, so there's only one copy
107-
@(Get-Content build.requires.psd1)
108-
| Where { $_ -notmatch "ModuleBuilder"}
109-
| Set-Content build.requires.psd1
102+
@(Get-Content build.requires.psd1) |
103+
Where { $_ -notmatch "ModuleBuilder"} |
104+
Set-Content build.requires.psd1
105+
110106
- name: ⚡ Install Required Modules
111107
uses: JustinGrote/ModuleFast-action@v0.0.1
108+
env:
109+
MODULEFAST_DESTINATION: ${{ github.workspace }}/Modules
112110
- name: Invoke-Pester
113-
shell: pwsh
111+
shell: matrix.shell
112+
env:
113+
MODULEFAST_DESTINATION: ${{ github.workspace }}/Modules
114114
run: | # PowerShell
115+
$Env:PSModulePath = $Env:MODULEFAST_DESTINATION + [IO.Path]::PathSeparator + $Env:PSModulePath
116+
115117
# For the cross-platform matrix we don't need to do coverage or anything complicated
116118
$Result = Invoke-Pester . -PassThru
117119
@(

‎Source/Public/Invoke-ScriptGenerator.ps1‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ function Invoke-ScriptGenerator {
114114
}
115115

116116
# Find that generator...
117-
$GeneratorCmd = Get-Command -Name ${Generator} -ParameterType Ast -ErrorAction Ignore <# -CommandType Function #>
118-
| Where-Object { $_.OutputType.Name -eq "TextReplacement" -or ($_.CommandType -eq "Alias" -and $_.Definition -like "PesterMock*" ) }
119-
| Select-Object -First 1
117+
$GeneratorCmd = Get-Command -Name ${Generator} -ParameterType Ast -ErrorAction Ignore <# -CommandType Function #> |
118+
Where-Object {
119+
$_.OutputType.Name -eq "TextReplacement" -or ($_.CommandType -eq "Alias" -and $_.Definition -like "PesterMock*" )
120+
} |
121+
Select-Object -First 1
120122

121123
if (-not $GeneratorCmd) {
122124
Write-Error "Generator missconfiguration. Unable to find Generator = '$Generator'"

‎Tests/Integration/Parameters.Tests.ps1‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ Describe "Parameters" -Tag Integration {
1111
New-Item $PSScriptRoot/Result3/Parameters/3.0.0/DeleteMe.md -ItemType File -Force
1212

1313
Write-Host "Module Under Test:"
14-
Get-Command Build-Module
15-
| Get-Module -Name { $_.Source }
16-
| Get-Item
17-
| Out-Host
14+
Get-Command Build-Module |
15+
Get-Module -Name { $_.Source } |
16+
Get-Item |
17+
Out-Host
1818
}
1919

2020
It "Passthru is read from the build manifest" {
21-
Build-Module (Convert-FolderSeparator "$PSScriptRoot/Parameters/build.psd1") -Verbose -OutVariable Output
22-
| Out-Host
21+
Build-Module (Convert-FolderSeparator "$PSScriptRoot/Parameters/build.psd1") -Verbose -OutVariable Output | Out-Host
2322

2423
$Output | Should -Not -BeNullOrEmpty
2524
$Output.Path | Convert-FolderSeparator | Should -Be (Convert-FolderSeparator "$PSScriptRoot/Result3/Parameters/3.0.0/Parameters.psd1")

‎Tests/Private/InitializeBuild.Tests.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ Describe "InitializeBuild" {
5252
$Result.Result.Name | Should -Be "MyModule"
5353
$Result.Result.SourceDirectories | Should -Be @("Classes", "Private", "Public")
5454

55-
(Convert-FolderSeparator $Result.Result.ModuleBase)
56-
| Should -Be (Convert-FolderSeparator "TestDrive:\Source")
55+
(Convert-FolderSeparator $Result.Result.ModuleBase) |
56+
Should -Be (Convert-FolderSeparator "TestDrive:\Source")
5757

58-
(Convert-FolderSeparator $Result.Result.SourcePath)
59-
| Should -Be (Convert-FolderSeparator "TestDrive:\Source\MyModule.psd1")
58+
(Convert-FolderSeparator $Result.Result.SourcePath) |
59+
Should -Be (Convert-FolderSeparator "TestDrive:\Source\MyModule.psd1")
6060
}
6161

6262
It "Returns default values from the Build Command" {

‎Tests/Public/Add-Parameter.Tests.ps1‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ Describe "Add-Parameter" {
6565

6666

6767
$showDate | Should -Not -BeNullOrEmpty
68-
$showDate.Body.ParamBlock.Parameters.Name.VariablePath.UserPath
69-
| Should -Be @('Format', 'ForegroundColor', 'BackgroundColor')
68+
$showDate.Body.ParamBlock.Parameters.Name.VariablePath.UserPath |
69+
Should -Be @('Format', 'ForegroundColor', 'BackgroundColor')
7070

7171
$showUserName | Should -Not -BeNullOrEmpty
72-
$showUserName.Body.ParamBlock.Parameters.Name.VariablePath.UserPath
73-
| Should -Be @('ForegroundColor', 'BackgroundColor')
72+
$showUserName.Body.ParamBlock.Parameters.Name.VariablePath.UserPath |
73+
Should -Be @('ForegroundColor', 'BackgroundColor')
7474

7575
# Get-Date Should not be modified, since it does not match the FunctionName filter
7676
$getDate = $Ast.Find({
@@ -79,8 +79,8 @@ Describe "Add-Parameter" {
7979
$node.Name -eq 'Get-Date'
8080
}, $true)
8181
$getDate | Should -Not -BeNullOrEmpty
82-
$getDate.Body.ParamBlock.Parameters.Name.VariablePath.UserPath
83-
| Should -Be @('Format')
82+
$getDate.Body.ParamBlock.Parameters.Name.VariablePath.UserPath |
83+
Should -Be @('Format')
8484
}
8585
}
8686
}

‎Tests/Public/Merge-ScriptBlock.Tests.ps1‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@ Describe "Merge-ScriptBlock" {
6060

6161

6262
$showDate | Should -Not -BeNullOrEmpty
63-
$showDate.Body.EndBlock -split "`n"
64-
| ForEach-Object { $_.Trim() }
65-
| Select-Object -Skip 1
66-
| Select-Object -First 3
67-
| Should -Be @(
68-
"`$ForegroundColor.ToVt() + `$BackgroundColor.ToVt(`$true) + ("
69-
"Get-Date -Format `$Format"
70-
") + `"``e[0m`""
71-
)
63+
$showDate.Body.EndBlock -split "`n" |
64+
ForEach-Object { $_.Trim() } |
65+
Select-Object -Skip 1 |
66+
Select-Object -First 3 |
67+
Should -Be @(
68+
"`$ForegroundColor.ToVt() + `$BackgroundColor.ToVt(`$true) + ("
69+
"Get-Date -Format `$Format"
70+
") + `"``e[0m`""
71+
)
7272

7373
$showUserName | Should -Not -BeNullOrEmpty
74-
$showUserName.Body.EndBlock -split "`n"
75-
| ForEach-Object { $_.Trim() }
76-
| Select-Object -Skip 1
77-
| Select-Object -First 3
78-
| Should -Be @(
79-
"`$ForegroundColor.ToVt() + `$BackgroundColor.ToVt(`$true) + ("
80-
"[Environment]::UserName"
74+
$showUserName.Body.EndBlock -split "`n" |
75+
ForEach-Object { $_.Trim() } |
76+
Select-Object -Skip 1 |
77+
Select-Object -First 3 |
78+
Should -Be @(
79+
"`$ForegroundColor.ToVt() + `$BackgroundColor.ToVt(`$true) + ("
80+
"[Environment]::UserName"
8181
") + `"``e[0m`""
8282
)
8383
}

‎build.build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Write-Information "$($PSStyle.Foreground.BrightMagenta)build.build.ps1$($PSStyle
1919

2020
## Self-contained build script - can be invoked directly or via Invoke-Build
2121
if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
22-
. (Convert-Path ../../[tT]asks/scripts/Invoke-Build.ps1) -File $MyInvocation.MyCommand.Path @PSBoundParameters -Result Result
22+
& (Convert-Path ../../[tT]asks/scripts/Invoke-Build.ps1) -File $MyInvocation.MyCommand.Path @PSBoundParameters -Result Result
2323

2424
if ($Result.Error) {
2525
$Error[-1].ScriptStackTrace | Out-Host

0 commit comments

Comments
 (0)