Skip to content

🚀 [Feature]: Add target branch detection to prevent releases from non-default branch merges #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariusStorhaug merged 6 commits into from
Jan 18, 2026
+24 −40
Merged

🚀 [Feature]: Add target branch detection to prevent releases from non-default branch merges #7

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c017ec9
Add target branch detection for default branch comparison
MariusStorhaug Jan 18, 2026
0cf689b
Only create Release when PR merges to default branch
MariusStorhaug Jan 18, 2026
2714999
Refactor job run condition calculations for improved clarity and effi…
MariusStorhaug Jan 18, 2026
d207d59
Only publish site when merging to default branch
MariusStorhaug Jan 18, 2026
e587925
Add newline at the end of README.md for better formatting
MariusStorhaug Jan 18, 2026
0850528
Remove trailing newline from README.md for cleaner formatting
MariusStorhaug Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 24 additions & 40 deletions scripts/main.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,47 +195,27 @@ $settings | Add-Member -MemberType NoteProperty -Name WorkingDirectory -Value $w

# Calculate job run conditions
LogGroup 'Calculate Job Run Conditions:' {
# Common conditions
$eventData = $null
try {
$eventData = Get-GitHubEventData -ErrorAction Stop
} catch {
if (-not [string]::IsNullOrEmpty($env:GITHUB_EVENT_PATH) -and (Test-Path -Path $env:GITHUB_EVENT_PATH)) {
$eventData = Get-Content -Path $env:GITHUB_EVENT_PATH -Raw | ConvertFrom-Json
}
}
$eventData = Get-GitHubEventData -ErrorAction Stop

LogGroup 'GitHub Event Data' {
if ($null -ne $eventData) {
Write-Host ($eventData | ConvertTo-Json -Depth 10 | Out-String)
} else {
Write-Host 'No event data available.'
}
}

$pullRequestAction = if ($null -ne $eventData.Action) {
$eventData.Action
} else {
$env:GITHUB_EVENT_ACTION
}

$pullRequest = if ($null -ne $eventData.PullRequest) {
$eventData.PullRequest
} else {
$null
$eventData | ConvertTo-Json -Depth 10 | Out-String
}

$pullRequestIsMerged = if ($null -ne $pullRequest -and $null -ne $pullRequest.Merged) {
[bool]$pullRequest.Merged
} else {
$false
}
$pullRequestAction = $eventData.Action
$pullRequest = $eventData.PullRequest
$pullRequestIsMerged = $pullRequest.Merged
$targetBranch = $pullRequest.Base.Ref
$defaultBranch = $eventData.Repository.default_branch
$isTargetDefaultBranch = $targetBranch -eq $defaultBranch

Write-Host 'GitHub event inputs:'
[pscustomobject]@{
GITHUB_EVENT_NAME = $env:GITHUB_EVENT_NAME
GITHUB_EVENT_ACTION = $pullRequestAction
GITHUB_EVENT_PULL_REQUEST_MERGED = $pullRequestIsMerged
TargetBranch = $targetBranch
DefaultBranch = $defaultBranch
IsTargetDefaultBranch = $isTargetDefaultBranch
} | Format-List | Out-String

$isPR = $env:GITHUB_EVENT_NAME -eq 'pull_request'
Expand All @@ -254,10 +234,13 @@ LogGroup 'Calculate Job Run Conditions:' {

# Determine ReleaseType - single source of truth for what Publish-PSModule should do
# Values: 'Release', 'Prerelease', 'Cleanup', 'None'
# Release only happens when PR is merged into the default branch
$releaseType = if (-not $isPR) {
'None'
} elseif ($isMergedPR) {
} elseif ($isMergedPR -and $isTargetDefaultBranch) {
'Release'
} elseif ($isMergedPR -and -not $isTargetDefaultBranch) {
'None' # Merged to non-default branch - no release
} elseif ($isAbandonedPR) {
'Cleanup'
} elseif ($shouldPrerelease) {
Expand All @@ -267,13 +250,14 @@ LogGroup 'Calculate Job Run Conditions:' {
}

[pscustomobject]@{
isPR = $isPR
isOpenOrUpdatedPR = $isOpenOrUpdatedPR
isAbandonedPR = $isAbandonedPR
isMergedPR = $isMergedPR
isNotAbandonedPR = $isNotAbandonedPR
shouldPrerelease = $shouldPrerelease
ReleaseType = $releaseType
isPR = $isPR
isOpenOrUpdatedPR = $isOpenOrUpdatedPR
isAbandonedPR = $isAbandonedPR
isMergedPR = $isMergedPR
isNotAbandonedPR = $isNotAbandonedPR
isTargetDefaultBranch = $isTargetDefaultBranch
shouldPrerelease = $shouldPrerelease
ReleaseType = $releaseType
} | Format-List | Out-String
}

Expand Down Expand Up @@ -467,7 +451,7 @@ LogGroup 'Calculate Job Run Conditions:' {
ReleaseType = $releaseType # 'Release', 'Prerelease', 'Cleanup', or 'None'
BuildDocs = $isNotAbandonedPR -and (-not $settings.Build.Docs.Skip)
BuildSite = $isNotAbandonedPR -and (-not $settings.Build.Site.Skip)
PublishSite = $isMergedPR
PublishSite = $isMergedPR -and $isTargetDefaultBranch
}
$settings | Add-Member -MemberType NoteProperty -Name Run -Value $run

Expand Down
Loading