- Fix Githib Action

Author: NinjaRocks

.github/workflows/PR-CI.yml

@@ -10,6 +10,13 @@ on:
     - develop/**
     - pre-release/**
     - release/**
+  push:
+    branches:
+    - pre-release/**
+    - pre-release
+    - release/**
+    - release
+
 jobs:
   Run-Lint:
     runs-on: ubuntu-latest
@@ -27,6 +34,7 @@ jobs:
           FILTER_REGEX_INCLUDE: .*src/.*
           DEFAULT_BRANCH: master
           GITHUB_TOKEN: '${{ env.github-token }}'
+  
   Build-Test:
     runs-on: ubuntu-latest
     outputs:
@@ -47,7 +55,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Step-03 Calculate Version
         id: gitversion
@@ -71,16 +79,21 @@ jobs:
         run: dotnet restore
         working-directory: '${{ env.working-directory }}'
 
-      - name: Step-07 Build Version (Beta)
-        if: ${{ !startsWith(github.head_ref, 'release/') }}
+      - name: Step-07 Build Version (Pre-release Alpha)
+        if: ${{ startsWith(github.head_ref, 'pre-release/') || startsWith(github.ref, 'refs/heads/pre-release/') }}
         run: dotnet build --configuration Release --no-restore -p:PackageVersion=${{ steps.gitversion.outputs.NuGetVersion }}
         working-directory: '${{ env.working-directory }}'
 
       - name: Step-07 Build Version (Release)
-        if: ${{ startsWith(github.head_ref, 'release/') }}
+        if: ${{ startsWith(github.head_ref, 'release/') || startsWith(github.ref, 'refs/heads/release/') }}
         run: dotnet build --configuration Release --no-restore -p:PackageVersion=${{ steps.gitversion.outputs.MajorMinorPatch }}
         working-directory: '${{ env.working-directory }}'
 
+      - name: Step-07 Build Version (Beta/Other)
+        if: ${{ !(startsWith(github.head_ref, 'pre-release/') || startsWith(github.ref, 'refs/heads/pre-release/') || startsWith(github.head_ref, 'release/') || startsWith(github.ref, 'refs/heads/release/')) }}
+        run: dotnet build --configuration Release --no-restore -p:PackageVersion=${{ steps.gitversion.outputs.NuGetVersion }}
+        working-directory: '${{ env.working-directory }}'
+
       - name: Step-08 Test Solution
         run: dotnet test --configuration Release --no-build --no-restore --verbosity normal
         working-directory: '${{ env.working-directory }}'
@@ -115,7 +128,7 @@ jobs:
   Release:
     name: Release to Nuget
     needs: [Package]
-    if: ${{ startsWith(github.head_ref, 'release/') }}
+    if: ${{ startsWith(github.head_ref, 'release/') || startsWith(github.ref, 'refs/heads/release/') }}
     runs-on: ubuntu-latest
     env:     
       nuget-token: '${{ secrets.NUGET_API_KEY }}' 

GitVersion.yml

@@ -3,19 +3,21 @@ tag-prefix: '[vV]'
 mode: ContinuousDeployment
 branches:
   master:
-    regex: ^master$
+    regex: ^master$|^main$
     tag: ''
     source-branches: ['develop']
+    is-main-branch: true
   release:
-    regex: ^release$
+    regex: ^releases?[\/-]
     tag: ''
-    source-branches: ['develop', 'master']
+    source-branches: ['master', 'develop']
+    is-release-branch: true
   pre-release:
-    regex: ^pre-release$|^pre-release/.*$
+    regex: ^pre-release$|^pre-release/.*
     tag: alpha
     increment: Minor
     prevent-increment-of-merged-branch-version: true
-    source-branches: ['develop', 'master']
+    source-branches: ['master', 'develop']
   develop:
     regex: ^develop$|^dev$
     tag: beta
@@ -24,6 +26,11 @@ branches:
   pull-request:
     tag: beta
     regex: ^(pull|pull\-requests|pr)[/-]
-    source-branches: ['develop', 'master', 'release', 'pre-release']
+    source-branches: ['master', 'develop', 'release', 'pre-release']
+  feature:
+    regex: ^features?[\/-]
+    tag: '{BranchName}'
+    increment: Inherit
+    source-branches: ['master', 'develop', 'release']
 ignore:
   sha: []