Sync scripts\make-version.ps1

ktsu-dev · Feb 5, 2025 · b0aa384 · b0aa384
1 parent b71d480
commit b0aa384
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/scripts/make-version.ps1 b/scripts/make-version.ps1
@@ -5,6 +5,11 @@ param (
 
 Set-PSDebug -Trace 1
 
+git config versionsort.suffix "-alpha"
+git config versionsort.suffix "-beta"
+git config versionsort.suffix "-rc"
+git config versionsort.suffix "-pre"
+
 # find the last version that was released
 $ALL_TAGS = git tag --list --sort=-v:refname
 if ($null -eq $ALL_TAGS) {
@@ -53,6 +58,10 @@ $LAST_COMMIT = $github_sha
 
 $COMMITS = "$FIRST_COMMIT...$LAST_COMMIT"
 
+$LAST_NON_MERGE_COMMIT = git log -n 1 --topo-order --perl-regexp --regexp-ignore-case --format=format:%H --grep="$EXCLUDE_PRS" --invert-grep $COMMITS
+
+$COMMITS = "$FIRST_COMMIT...$LAST_NON_MERGE_COMMIT"
+
 $LAST_PATCH_COMMIT = git log -n 1 --topo-order --perl-regexp --regexp-ignore-case --format=format:%H --committer="$EXCLUDE_BOTS" --author="$EXCLUDE_BOTS" --grep="$EXCLUDE_PRS" --invert-grep $COMMITS
 
 $LAST_MINOR_COMMIT = git log -n 1 --topo-order --perl-regexp --regexp-ignore-case --format=format:%H --committer="$EXCLUDE_BOTS" --author="$EXCLUDE_BOTS" --grep="$EXCLUDE_PRS" --invert-grep $COMMITS `
@@ -69,11 +78,11 @@ $LAST_MINOR_COMMIT = git log -n 1 --topo-order --perl-regexp --regexp-ignore-cas
     $EXCLUDE_CI_FILES
 
 $VERSION_INCREMENT = 'prerelease'
-if ($LAST_COMMIT -eq $LAST_PATCH_COMMIT) {
+if ($LAST_NON_MERGE_COMMIT -eq $LAST_PATCH_COMMIT) {
     $VERSION_INCREMENT = 'patch'
 }
 
-if ($LAST_COMMIT -eq $LAST_MINOR_COMMIT) {
+if ($LAST_NON_MERGE_COMMIT -eq $LAST_MINOR_COMMIT) {
     $VERSION_INCREMENT = 'minor'
 }
 
@@ -108,6 +117,7 @@ Write-Host "LAST_VERSION_PRERELEASE: $LAST_VERSION_PRERELEASE"
 Write-Host "IS_PRERELEASE: $IS_PRERELEASE"
 Write-Host "FIRST_COMMIT: $FIRST_COMMIT"
 Write-Host "LAST_COMMIT: $LAST_COMMIT"
+Write-Host "LAST_NON_MERGE_COMMIT: $LAST_NON_MERGE_COMMIT"
 Write-Host "LAST_PATCH_COMMIT: $LAST_PATCH_COMMIT"
 Write-Host "LAST_MINOR_COMMIT: $LAST_MINOR_COMMIT"
 Write-Host "VERSION_INCREMENT: $VERSION_INCREMENT"
@@ -122,6 +132,7 @@ Write-Host "VERSION: $VERSION"
 "IS_PRERELEASE=$IS_PRERELEASE" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 "FIRST_COMMIT=$FIRST_COMMIT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 "LAST_COMMIT=$LAST_COMMIT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+"LAST_NON_MERGE_COMMIT=$LAST_NON_MERGE_COMMIT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 "LAST_PATCH_COMMIT=$LAST_PATCH_COMMIT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 "LAST_MINOR_COMMIT=$LAST_MINOR_COMMIT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 "VERSION_INCREMENT=$VERSION_INCREMENT" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append