From 3a26769e4b3162b67a0f58d10a3e6af8c0294460 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 19:28:31 +0200
Subject: [PATCH 1/7] Decouple prerelease cleanup from publish artifact

Run prerelease cleanup independently when no module artifact is produced by gating publish-only steps behind CreateRelease and driving cleanup behavior from ReleaseType.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/Publish-PSModule/action.yml      | 14 ++++++++++++--
 .github/actions/Publish-PSModule/src/publish.ps1 |  4 +---
 .github/workflows/Publish-Module.yml             |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index c17c16e2..27fbb543 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -7,9 +7,17 @@ inputs:
     description: Name of the module to publish.
     required: false
   ModulePath:
-    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule. A module artifact must exist before invoking this action.
+    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule. Required only when CreateRelease is true.
     required: false
     default: outputs/module
+  CreateRelease:
+    description: When true, downloads the module artifact and runs publish.ps1 (PowerShell Gallery + GitHub Release flow).
+    required: false
+    default: 'false'
+  ReleaseType:
+    description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
+    required: false
+    default: None
   APIKey:
     description: PowerShell Gallery API Key.
     required: true
@@ -54,12 +62,14 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
+      if: inputs.CreateRelease == 'true'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
+      if: inputs.CreateRelease == 'true'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
@@ -73,7 +83,7 @@ runs:
       run: ${{ github.action_path }}/src/publish.ps1
 
     - name: Cleanup Prereleases
-      if: env.PSMODULE_PUBLISH_PSMODULE_CONTEXT_IsPrerelease != 'true' && (inputs.AutoCleanup == 'true' || inputs.WhatIf == 'true')
+      if: inputs.ReleaseType != 'Prerelease' && (inputs.AutoCleanup == 'true' || inputs.WhatIf == 'true')
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
diff --git a/.github/actions/Publish-PSModule/src/publish.ps1 b/.github/actions/Publish-PSModule/src/publish.ps1
index 6b08e27f..d99b31be 100644
--- a/.github/actions/Publish-PSModule/src/publish.ps1
+++ b/.github/actions/Publish-PSModule/src/publish.ps1
@@ -140,9 +140,7 @@ LogGroup 'Resolve version from manifest' {
         PRHeadRef        = $prHeadRef
     } | Format-List | Out-String
 
-    # Expose publish context to subsequent steps so the cleanup step can gate on release type.
-    $envLine = "PSMODULE_PUBLISH_PSMODULE_CONTEXT_IsPrerelease=$($createPrerelease.ToString().ToLower())"
-    $envLine | Out-File -Path $env:GITHUB_ENV -Append -Encoding utf8NoBOM
+    # Expose release tag to subsequent steps so cleanup can exclude the just-published tag.
     "PSMODULE_PUBLISH_PSMODULE_CONTEXT_ReleaseTag=$releaseTag" | Out-File -Path $env:GITHUB_ENV -Append -Encoding utf8NoBOM
 }
 #endregion Resolve version from manifest
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index e46b3b1c..8bac8afa 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -44,6 +44,8 @@ jobs:
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
+          CreateRelease: ${{ fromJson(inputs.Settings).Module.CreateRelease }}
+          ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}
           AutoCleanup: ${{ fromJson(inputs.Settings).Publish.Module.AutoCleanup }}

From c2f433c1dd6f457305a7f24e0c926c9b70e52da1 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 20:01:03 +0200
Subject: [PATCH 2/7] Use ReleaseType as publish gate

Remove CreateRelease input and gate publish steps directly on ReleaseType so None means no release flow.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/Publish-PSModule/action.yml | 10 +++-------
 .github/workflows/Publish-Module.yml        |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index 27fbb543..b511738c 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -7,13 +7,9 @@ inputs:
     description: Name of the module to publish.
     required: false
   ModulePath:
-    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule. Required only when CreateRelease is true.
+    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule. Required only when ReleaseType is not None.
     required: false
     default: outputs/module
-  CreateRelease:
-    description: When true, downloads the module artifact and runs publish.ps1 (PowerShell Gallery + GitHub Release flow).
-    required: false
-    default: 'false'
   ReleaseType:
     description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
     required: false
@@ -62,14 +58,14 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
-      if: inputs.CreateRelease == 'true'
+      if: inputs.ReleaseType != 'None'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
-      if: inputs.CreateRelease == 'true'
+      if: inputs.ReleaseType != 'None'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index 8bac8afa..42521764 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -44,7 +44,6 @@ jobs:
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
-          CreateRelease: ${{ fromJson(inputs.Settings).Module.CreateRelease }}
           ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}

From c4af7da9ea71d0e223318866e5341980c53a12e0 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 20:09:01 +0200
Subject: [PATCH 3/7] Split prerelease cleanup into dedicated action

Extract prerelease cleanup from Publish-PSModule into Cleanup-PSModulePrereleases and wire Publish-Module workflow to run publish and cleanup as separate scenario-gated steps.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../Cleanup-PSModulePrereleases/action.yml    | 34 +++++++++++++++++++
 .../src/cleanup.ps1                           |  4 +--
 .github/actions/Publish-PSModule/action.yml   | 23 +------------
 .github/workflows/Publish-Module.yml          | 13 +++++--
 4 files changed, 48 insertions(+), 26 deletions(-)
 create mode 100644 .github/actions/Cleanup-PSModulePrereleases/action.yml
 rename .github/actions/{Publish-PSModule => Cleanup-PSModulePrereleases}/src/cleanup.ps1 (94%)

diff --git a/.github/actions/Cleanup-PSModulePrereleases/action.yml b/.github/actions/Cleanup-PSModulePrereleases/action.yml
new file mode 100644
index 00000000..af728ffd
--- /dev/null
+++ b/.github/actions/Cleanup-PSModulePrereleases/action.yml
@@ -0,0 +1,34 @@
+name: Cleanup-PSModulePrereleases
+description: Cleanup prerelease GitHub releases associated with the current pull request branch.
+author: PSModule
+
+inputs:
+  AutoCleanup:
+    description: Control whether to automatically delete prerelease tags.
+    required: false
+    default: 'true'
+  WhatIf:
+    description: If specified, the action will only log the changes it would make.
+    required: false
+    default: 'false'
+  WorkingDirectory:
+    description: The working directory where the script will run from.
+    required: false
+    default: '.'
+
+runs:
+  using: composite
+  steps:
+    - name: Install-PSModule
+      uses: ./_wf/.github/actions/Install-PSModule
+
+    - name: Cleanup Prereleases
+      if: inputs.AutoCleanup == 'true' || inputs.WhatIf == 'true'
+      shell: pwsh
+      working-directory: ${{ inputs.WorkingDirectory }}
+      env:
+        PSMODULE_CLEANUP_PSMODULEPRERELEASES_INPUT_WhatIf: ${{ inputs.WhatIf }}
+        PSMODULE_CLEANUP_PSMODULEPRERELEASES_CONTEXT_ReleaseTag: ${{ env.PSMODULE_PUBLISH_PSMODULE_CONTEXT_ReleaseTag }}
+      run: |
+        # Cleanup prerelease tags
+        ${{ github.action_path }}/src/cleanup.ps1
diff --git a/.github/actions/Publish-PSModule/src/cleanup.ps1 b/.github/actions/Cleanup-PSModulePrereleases/src/cleanup.ps1
similarity index 94%
rename from .github/actions/Publish-PSModule/src/cleanup.ps1
rename to .github/actions/Cleanup-PSModulePrereleases/src/cleanup.ps1
index b7e64ce7..546593a8 100644
--- a/.github/actions/Publish-PSModule/src/cleanup.ps1
+++ b/.github/actions/Cleanup-PSModulePrereleases/src/cleanup.ps1
@@ -7,7 +7,7 @@ Import-Module -Name 'Helpers' -Force
 
 #region Load inputs
 LogGroup 'Load inputs' {
-    $whatIf = $env:PSMODULE_PUBLISH_PSMODULE_INPUT_WhatIf -eq 'true'
+    $whatIf = $env:PSMODULE_CLEANUP_PSMODULEPRERELEASES_INPUT_WhatIf -eq 'true'
 
     $githubEventJson = Get-Content -Raw $env:GITHUB_EVENT_PATH
     $githubEvent = $githubEventJson | ConvertFrom-Json
@@ -27,7 +27,7 @@ LogGroup 'Load inputs' {
     Write-Host "Prerelease name:  [$prereleaseName]"
     Write-Host "WhatIf:           [$whatIf]"
 
-    $publishedReleaseTag = $env:PSMODULE_PUBLISH_PSMODULE_CONTEXT_ReleaseTag
+    $publishedReleaseTag = $env:PSMODULE_CLEANUP_PSMODULEPRERELEASES_CONTEXT_ReleaseTag
     if (-not [string]::IsNullOrWhiteSpace($publishedReleaseTag)) {
         Write-Host "Published tag:    [$publishedReleaseTag] (excluded from cleanup)"
     }
diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index b511738c..c855fe20 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -7,20 +7,12 @@ inputs:
     description: Name of the module to publish.
     required: false
   ModulePath:
-    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule. Required only when ReleaseType is not None.
+    description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule.
     required: false
     default: outputs/module
-  ReleaseType:
-    description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
-    required: false
-    default: None
   APIKey:
     description: PowerShell Gallery API Key.
     required: true
-  AutoCleanup:
-    description: Control whether to automatically delete the prerelease tags after the stable release is created.
-    required: false
-    default: 'true'
   WhatIf:
     description: If specified, the action will only log the changes it would make, but will not actually create or delete any releases or tags.
     required: false
@@ -58,14 +50,12 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
-      if: inputs.ReleaseType != 'None'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
-      if: inputs.ReleaseType != 'None'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
@@ -77,14 +67,3 @@ runs:
         PSMODULE_PUBLISH_PSMODULE_INPUT_UsePRTitleAsReleaseName: ${{ inputs.UsePRTitleAsReleaseName }}
         PSMODULE_PUBLISH_PSMODULE_INPUT_UsePRTitleAsNotesHeading: ${{ inputs.UsePRTitleAsNotesHeading }}
       run: ${{ github.action_path }}/src/publish.ps1
-
-    - name: Cleanup Prereleases
-      if: inputs.ReleaseType != 'Prerelease' && (inputs.AutoCleanup == 'true' || inputs.WhatIf == 'true')
-      shell: pwsh
-      working-directory: ${{ inputs.WorkingDirectory }}
-      env:
-        PSMODULE_PUBLISH_PSMODULE_INPUT_WhatIf: ${{ inputs.WhatIf }}
-        PSMODULE_PUBLISH_PSMODULE_CONTEXT_ReleaseTag: ${{ env.PSMODULE_PUBLISH_PSMODULE_CONTEXT_ReleaseTag }}
-      run: |
-        # Cleanup prerelease tags
-        ${{ github.action_path }}/src/cleanup.ps1
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index 42521764..d23414d8 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -38,17 +38,26 @@ jobs:
           persist-credentials: false
 
       - name: Publish module
+        if: fromJson(inputs.Settings).Module.ReleaseType != 'None'
         uses: ./_wf/.github/actions/Publish-PSModule
         env:
           GH_TOKEN: ${{ github.token }}
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
-          ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}
-          AutoCleanup: ${{ fromJson(inputs.Settings).Publish.Module.AutoCleanup }}
           UsePRTitleAsReleaseName: ${{ fromJson(inputs.Settings).Publish.Module.UsePRTitleAsReleaseName }}
           UsePRBodyAsReleaseNotes: ${{ fromJson(inputs.Settings).Publish.Module.UsePRBodyAsReleaseNotes }}
           UsePRTitleAsNotesHeading: ${{ fromJson(inputs.Settings).Publish.Module.UsePRTitleAsNotesHeading }}
           WorkingDirectory: ${{ fromJson(inputs.Settings).WorkingDirectory }}
+
+      - name: Cleanup prereleases
+        if: fromJson(inputs.Settings).Module.ReleaseType != 'Prerelease'
+        uses: ./_wf/.github/actions/Cleanup-PSModulePrereleases
+        env:
+          GH_TOKEN: ${{ github.token }}
+        with:
+          WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}
+          AutoCleanup: ${{ fromJson(inputs.Settings).Publish.Module.AutoCleanup }}
+          WorkingDirectory: ${{ fromJson(inputs.Settings).WorkingDirectory }}

From fd33c37d64c48588bda25e6dd1cc15e511520e9a Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 19:28:31 +0200
Subject: [PATCH 4/7] Decouple prerelease cleanup from publish artifact

Run prerelease cleanup independently when no module artifact is produced by gating publish-only steps behind CreateRelease and driving cleanup behavior from ReleaseType.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/Publish-PSModule/action.yml | 10 ++++++++++
 .github/workflows/Publish-Module.yml        |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index c855fe20..5d378cb7 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -10,6 +10,14 @@ inputs:
     description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule.
     required: false
     default: outputs/module
+  CreateRelease:
+    description: When true, downloads the module artifact and runs publish.ps1 (PowerShell Gallery + GitHub Release flow).
+    required: false
+    default: 'false'
+  ReleaseType:
+    description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
+    required: false
+    default: None
   APIKey:
     description: PowerShell Gallery API Key.
     required: true
@@ -50,12 +58,14 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
+      if: inputs.CreateRelease == 'true'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
+      if: inputs.CreateRelease == 'true'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index d23414d8..f5b58142 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -45,6 +45,8 @@ jobs:
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
+          CreateRelease: ${{ fromJson(inputs.Settings).Module.CreateRelease }}
+          ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}
           UsePRTitleAsReleaseName: ${{ fromJson(inputs.Settings).Publish.Module.UsePRTitleAsReleaseName }}

From d5631d5464303094e419832aed46795b81b1ab56 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 20:01:03 +0200
Subject: [PATCH 5/7] Use ReleaseType as publish gate

Remove CreateRelease input and gate publish steps directly on ReleaseType so None means no release flow.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/Publish-PSModule/action.yml | 8 ++------
 .github/workflows/Publish-Module.yml        | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index 5d378cb7..f9ff4a2c 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -10,10 +10,6 @@ inputs:
     description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule.
     required: false
     default: outputs/module
-  CreateRelease:
-    description: When true, downloads the module artifact and runs publish.ps1 (PowerShell Gallery + GitHub Release flow).
-    required: false
-    default: 'false'
   ReleaseType:
     description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
     required: false
@@ -58,14 +54,14 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
-      if: inputs.CreateRelease == 'true'
+      if: inputs.ReleaseType != 'None'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
-      if: inputs.CreateRelease == 'true'
+      if: inputs.ReleaseType != 'None'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index f5b58142..a9efa9dd 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -45,7 +45,6 @@ jobs:
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
-          CreateRelease: ${{ fromJson(inputs.Settings).Module.CreateRelease }}
           ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}

From 31938e20d95221300d5f77b6830fc37d90ea5e62 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 20:09:01 +0200
Subject: [PATCH 6/7] Split prerelease cleanup into dedicated action

Extract prerelease cleanup from Publish-PSModule into Cleanup-PSModulePrereleases and wire Publish-Module workflow to run publish and cleanup as separate scenario-gated steps.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/actions/Publish-PSModule/action.yml | 6 ------
 .github/workflows/Publish-Module.yml        | 1 -
 2 files changed, 7 deletions(-)

diff --git a/.github/actions/Publish-PSModule/action.yml b/.github/actions/Publish-PSModule/action.yml
index f9ff4a2c..c855fe20 100644
--- a/.github/actions/Publish-PSModule/action.yml
+++ b/.github/actions/Publish-PSModule/action.yml
@@ -10,10 +10,6 @@ inputs:
     description: Path to the folder containing the <Name>/ module subdirectory from Build-PSModule.
     required: false
     default: outputs/module
-  ReleaseType:
-    description: Resolved release type from settings (Release, Prerelease, None). Used to control prerelease cleanup behavior.
-    required: false
-    default: None
   APIKey:
     description: PowerShell Gallery API Key.
     required: true
@@ -54,14 +50,12 @@ runs:
         Install-PSResource -Name Microsoft.PowerShell.PSResourceGet -Repository PSGallery -TrustRepository
 
     - name: Download module artifact
-      if: inputs.ReleaseType != 'None'
       uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
       with:
         name: ${{ inputs.ArtifactName }}
         path: ${{ inputs.ModulePath }}
 
     - name: Publish Module
-      if: inputs.ReleaseType != 'None'
       shell: pwsh
       working-directory: ${{ inputs.WorkingDirectory }}
       env:
diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index a9efa9dd..d23414d8 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -45,7 +45,6 @@ jobs:
         with:
           Name: ${{ fromJson(inputs.Settings).Name }}
           ModulePath: outputs/module
-          ReleaseType: ${{ fromJson(inputs.Settings).Module.ReleaseType }}
           APIKey: ${{ secrets.APIKey }}
           WhatIf: ${{ github.repository == 'PSModule/Process-PSModule' }}
           UsePRTitleAsReleaseName: ${{ fromJson(inputs.Settings).Publish.Module.UsePRTitleAsReleaseName }}

From ed0deacd1b102aff38af8f7030a83e39727d2dae Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sat, 18 Jul 2026 22:47:14 +0200
Subject: [PATCH 7/7] Align publish gating with resolved settings path

Use Settings.Publish.Module.Resolution.ReleaseType in Publish-Module workflow to match the enriched settings shape from Plan.yml.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/Publish-Module.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Publish-Module.yml b/.github/workflows/Publish-Module.yml
index d23414d8..ee1bbcb6 100644
--- a/.github/workflows/Publish-Module.yml
+++ b/.github/workflows/Publish-Module.yml
@@ -38,7 +38,7 @@ jobs:
           persist-credentials: false
 
       - name: Publish module
-        if: fromJson(inputs.Settings).Module.ReleaseType != 'None'
+        if: fromJson(inputs.Settings).Publish.Module.Resolution.ReleaseType != 'None'
         uses: ./_wf/.github/actions/Publish-PSModule
         env:
           GH_TOKEN: ${{ github.token }}
@@ -53,7 +53,7 @@ jobs:
           WorkingDirectory: ${{ fromJson(inputs.Settings).WorkingDirectory }}
 
       - name: Cleanup prereleases
-        if: fromJson(inputs.Settings).Module.ReleaseType != 'Prerelease'
+        if: fromJson(inputs.Settings).Publish.Module.Resolution.ReleaseType != 'Prerelease'
         uses: ./_wf/.github/actions/Cleanup-PSModulePrereleases
         env:
           GH_TOKEN: ${{ github.token }}