🩹 [Patch]: Remove initialization step and dependency on Utilities (#50)

MariusStorhaug · web-flow · commit caa0ab145d94 · 2025-06-02T01:20:58.000+02:00
## Description Remove the initialization step and dependency on `Utilities`, the Install-PSModuleHelpers takes over. ## Type of change  - [ ] 📖 [Docs] - [ ] 🪲 [Fix] - [x] 🩹 [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/Action-Test.yml b/.github/workflows/Action-Test.yml
@@ -24,9 +24,6 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
 
-      - name: Initialize environment
-        uses: PSModule/Initialize-PSModule@main
-
       - name: Action-Test
         uses: ./
         env:
diff --git a/scripts/helpers/Publish-PSModule.ps1 b/scripts/helpers/Publish-PSModule.ps1
@@ -11,7 +11,6 @@
     #>
     [OutputType([void])]
     [CmdletBinding()]
-    #Requires -Modules Utilities, PowerShellGet, Microsoft.PowerShell.PSResourceGet, GitHub, PSSemVer
     [Diagnostics.CodeAnalysis.SuppressMessageAttribute(
         'PSReviewUnusedParameter', '', Scope = 'Function',
         Justification = 'LogGroup - Scoping affects the variables line of sight.'
@@ -146,7 +145,7 @@
         $latestRelease = $releases | Where-Object { $_.isLatest -eq $true }
         $latestRelease | Format-List | Out-String
         $ghReleaseVersionString = $latestRelease.tagName
-        if ($ghReleaseVersionString | IsNotNullOrEmpty) {
+        if (-not [string]::IsNullOrEmpty($ghReleaseVersionString)) {
             $ghReleaseVersion = New-PSSemVer -Version $ghReleaseVersionString
         } else {
             Write-Warning 'Could not find the latest release version. Using ''0.0.0'' as the version.'
@@ -198,7 +197,7 @@
         try {
             $manifestVersion = New-PSSemVer -Version (Test-ModuleManifest $manifestFilePath -Verbose:$false).Version
         } catch {
-            if ($manifestVersion | IsNullOrEmpty) {
+            if ([string]::IsNullOrEmpty($manifestVersion)) {
                 Write-Warning 'Could not find the module version in the manifest. Using ''0.0.0'' as the version.'
                 $manifestVersion = New-PSSemVer -Version '0.0.0'
             }
@@ -249,7 +248,7 @@
             $newVersion.Prerelease = $prereleaseName
             Write-Output "Partial new version: [$newVersion]"
 
-            if ($datePrereleaseFormat | IsNotNullOrEmpty) {
+            if (-not [string]::IsNullOrEmpty($datePrereleaseFormat)) {
                 Write-Output "Using date-based prerelease: [$datePrereleaseFormat]."
                 $newVersion.Prerelease += "$(Get-Date -Format $datePrereleaseFormat)"
                 Write-Output "Partial new version: [$newVersion]"
diff --git a/scripts/main.ps1 b/scripts/main.ps1
@@ -1,6 +1,22 @@
 [CmdletBinding()]
 param()
 
+$retryCount = 5
+$retryDelay = 10
+for ($i = 0; $i -lt $retryCount; $i++) {
+    try {
+        Install-PSResource -Name 'PSSemVer' -TrustRepository -Repository PSGallery
+        break
+    } catch {
+        Write-Warning "Installation of $($psResourceParams.Name) failed with error: $_"
+        if ($i -eq $retryCount - 1) {
+            throw
+        }
+        Write-Warning "Retrying in $retryDelay seconds..."
+        Start-Sleep -Seconds $retryDelay
+    }
+}
+
 $path = (Join-Path -Path $PSScriptRoot -ChildPath 'helpers')
 LogGroup "Loading helper scripts from [$path]" {
     Get-ChildItem -Path $path -Filter '*.ps1' -Recurse | ForEach-Object {
