Merge pull request #11 from vndevpro/feature/f3

Feature/f3

Author: juanonsoftware

.github/workflows/ci-develop.yml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Create and Push new tag
         shell: pwsh
         run: |

.github/workflows/ci-hotfix.yml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Create and Push new tag
         shell: pwsh
         run: |

.github/workflows/ci-master.yml

@@ -9,8 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Create and Push new tag
         shell: pwsh
         run: |
          . ./Scripts/VersionManager.ps1
-         New-Tag -Branch "master"
+         New-Tag -Branch "master" -SourceBranch "${{ github.head_ref }}"

.github/workflows/ci-release.yml

@@ -9,6 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  
       - name: Create and Push new tag
         shell: pwsh
         run: |

Scripts/VersionManager.ps1

@@ -5,28 +5,42 @@ function New-Tag
 {
 	param (
         [Parameter(Mandatory=$true)]
-        [string]$Branch
+        [string]$Branch,
+		
+		[Parameter(Mandatory=$false)]
+        [string]$SourceBranch = ""		
     )
 
 	$version = Get-CurrentVersion
 	$patch = Get-NewPatch
 	$prefix = ""
 
+	# Release branch needs to increase version and add "Beta-" prefix
 	if ($Branch -eq "release")
 	{
 		$version = ([decimal]$version + 0.1).ToString()
 		$prefix = "Beta-"
 	}
+
+	# Develop branch needs to increase version and add "Dev-" prefix
 	if ($Branch -eq "develop")
 	{
 		$version = ([decimal]$version + 0.1).ToString()
 		$prefix = "Dev-"
 	}
+	
+	# Hotfix branch just needs to add "HF-" prefix
 	if ($Branch -eq "hotfix")
 	{
 		$prefix = "HF-"
 	}
 
+	# Increase version if merge from "release" branch to "master" branch
+	if ($Branch -eq "master" -and $SourceBranch -eq "release")
+	{
+		$version = ([decimal]$version + 0.1).ToString()
+	}
+	
 	$tag = "v$version.$prefix$patch"
 
 	Invoke-Expression "git tag $tag"