🪲 [Fix]: Obay module manifest overrides during tests (#48)

MariusStorhaug · web-flow · commit d8aeb04dda05 · 2024-11-06T13:12:51.000+01:00
## Description - Fixes #49 ## Type of change  - [ ] 📖 [Docs] - [x] 🪲 [Fix] - [ ] 🩹 [Patch] - [ ] ⚠️ [Security fix] - [ ] 🚀 [Feature] - [ ] 🌟 [Breaking change] ## Checklist  - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -378,14 +378,23 @@ jobs:
                 $path = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "${{ inputs.ModulesOutputPath }}\$moduleName"
                 $moduleManifestPath = Join-Path -Path $Path -ChildPath "$moduleName.psd1"
 
+                # Obay module manifest overrides
+                $sourcePath = Join-Path -Path $env:GITHUB_WORKSPACE -ChildPath "${{ inputs.Path }}"
+                $sourceModuleManifestPath = Join-Path -Path $sourcePath -ChildPath "manifest.psd1"
+                if (Test-Path -Path $sourceModuleManifestPath) {
+                  $sourceManifest = Import-PowerShellDataFile -Path $sourceModuleManifestPath
+                }
+
                 $data = [pscustomobject]@{
                   ModuleName         = $moduleName
                   Path               = $path
                   ModuleManifestPath = $moduleManifestPath
                 }
                 Write-Verbose ($data | Format-List | Out-String) -Verbose
 
-                Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion '7.4'
+                # If the source module manifest has a PowerShellVersion, use that, otherwise use the latest version.
+                $powerShellVersion = $sourceManifest.PowerShellVersion ?? '7.4'
+                Set-ModuleManifest -Path $moduleManifestPath -PowerShellVersion $powerShellVersion
 
                 Add-ModuleManifestData -Path $moduleManifestPath -CompatiblePSEditions 'Core'
                 Add-ModuleManifestData -Path $moduleManifestPath -Tags 'PSEdition_Core'
@@ -403,6 +412,10 @@ jobs:
                 }
             }
 
+            LogGroup 'Module Manifest - Source' {
+                Show-FileContent -Path $moduleManifestPath
+            }
+
             LogGroup 'Module Manifest' {
                 Show-FileContent -Path $moduleManifestPath
             }
diff --git a/tests/srcWithManifest/manifest.psd1 b/tests/srcWithManifest/manifest.psd1
@@ -1,3 +1,4 @@
 @{
-    Author = 'Author'
+    Author            = 'Author'
+    PowerShellVersion = '5.1'
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`@{`
`2`		`- Author = 'Author'`
	`2`	`+ Author = 'Author'`
	`3`	`+ PowerShellVersion = '5.1'`
`3`	`4`	`}`