fix: ugit action checking before -InstallModule ( Fixes #290 )

Also, importing from workspace if found
StartAutomating · Oct 15, 2024 · ef5b0ee · ef5b0ee
1 parent f44fc16
commit ef5b0ee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Build/GitHub/Actions/UGitAction.ps1 b/Build/GitHub/Actions/UGitAction.ps1
@@ -92,8 +92,13 @@ function InstallActionModule {
             $(Get-Content $_.FullName -Raw) -match 'ModuleVersion'
         }
     if (-not $moduleInWorkspace) {
-        Install-Module $moduleToInstall -Scope CurrentUser -Force
+        $availableModules = Get-Module -ListAvailable
+        if ($availableModules.Name -notcontains $moduleToInstall) {
+            Install-Module $moduleToInstall -Scope CurrentUser -Force -AcceptLicense -AllowClobber
+        }
         Import-Module $moduleToInstall -Force -PassThru | Out-Host
+    } else {
+        Import-Module $moduleInWorkspace.FullName -Force -PassThru | Out-Host
     }
 }
 function ImportActionModule {

diff --git a/action.yml b/action.yml
@@ -185,8 +185,13 @@ runs:
                     $(Get-Content $_.FullName -Raw) -match 'ModuleVersion'
                 }
             if (-not $moduleInWorkspace) {
-                Install-Module $moduleToInstall -Scope CurrentUser -Force
+                $availableModules = Get-Module -ListAvailable
+                if ($availableModules.Name -notcontains $moduleToInstall) {
+                    Install-Module $moduleToInstall -Scope CurrentUser -Force -AcceptLicense -AllowClobber
+                }
                 Import-Module $moduleToInstall -Force -PassThru | Out-Host
+            } else {
+                Import-Module $moduleInWorkspace.FullName -Force -PassThru | Out-Host
             }
         }
         function ImportActionModule {