fix: whatif prevents write-output (#14)

ArwynFr · Apr 17, 2023 · 37ab0ca · 37ab0ca
1 parent a4d371b
commit 37ab0ca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/functions/Get-SemVer.ps1 → functions/Get-CurrentVersion.ps1 b/functions/Get-SemVer.ps1 → functions/Get-CurrentVersion.ps1
diff --git a/functions/Get-NewVersion.ps1 b/functions/Get-NewVersion.ps1
@@ -0,0 +1,20 @@
+[CmdletBinding(SupportsShouldProcess)]
+param (
+ [Parameter(Mandatory)]
+ [string]
+ $RepositoryName,
+
+ [Parameter()]
+ [string]
+ $CommitMessage
+)
+
+$Private:currentVersion = & $PSScriptRoot/Get-CurrentVersion.ps1 -RepositoryName "$RepositoryName"
+$Private:bumpType = & $PSScriptRoot/Get-VersionBumpType.ps1 -CommitMessage "$CommitMessage"
+$Private:nextVersion = & $PSScriptRoot/New-SemVer.ps1 -Version $Private:currentVersion -BumpType $Private:bumpType
+
+"current-version=$Private:currentVersion" >> $env:GITHUB_OUTPUT
+"bump-type=$Private:bumpType" >> $env:GITHUB_OUTPUT
+"next-version=$Private:nextVersion" >> $env:GITHUB_OUTPUT
+
+return $Private:nextVersion #| Out-Null
diff --git a/functions/New-GithubRelease.ps1 b/functions/New-GithubRelease.ps1
@@ -13,19 +13,12 @@ param (
  $Pattern
 )
 
-$Private:currentVersion = & $PSScriptRoot/Get-SemVer.ps1 -RepositoryName "$RepositoryName"
-$Private:bumpType = & $PSScriptRoot/Get-VersionBumpType.ps1 -CommitMessage "$CommitMessage"
-$Private:nextVersion = & $PSScriptRoot/New-SemVer.ps1 -Version $Private:currentVersion -BumpType $Private:bumpType
-
-Write-Host "current-version=$Private:currentVersion" >> $env:GITHUB_OUTPUT
-Write-Host "bump-type=$Private:bumpType" >> $env:GITHUB_OUTPUT
-Write-Host "next-version=$Private:nextVersion" >> $env:GITHUB_OUTPUT
+$private:nextVersion = & $PSScriptRoot/Get-NewVersion.ps1 -RepositoryName $RepositoryName -CommitMessage $CommitMessage
 
 if ($PSCmdlet.ShouldProcess($private:nextVersion, 'gh release create')) {
  if (($null -eq $Pattern) -or ('' -eq $Pattern)) {
  gh release create "$private:nextVersion" --generate-notes --repo "$RepositoryName"
- }
- else {
+ } else {
  gh release create "$private:nextVersion" --generate-notes --repo "$RepositoryName" (Get-Item "$Pattern")
  }
 }
diff --git a/get-newVersion/action.yml b/get-newVersion/action.yml
@@ -27,7 +27,6 @@ runs:
  id: new-github-release
  run: |
  "${{ github.token }}" | gh auth login --with-token
- & "${env:GITHUB_ACTION_PATH}/../functions/New-GithubRelease.ps1" `
+ & "${env:GITHUB_ACTION_PATH}/../functions/Get-NewVersion.ps1" `
  -RepositoryName "${{ github.repository }}" `
- -CommitMessage "${{ github.event.head_commit.message }}" `
- -Whatif
+ -CommitMessage "${{ github.event.head_commit.message }}"