more

Author: stevencl840

.github/workflows/ci.yml

@@ -33,11 +33,15 @@ jobs:
       - name: Set version override
         if: github.event_name == 'pull_request' && github.head_ref != ''
         run: |
-          $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
-          $preRelease = "octopus-$branchName.${{ github.run_number }}"
-          Write-Host "PR build - using version override: $preRelease (height ignored)"
-          "MINVERDEFAULTPRERELEASEIDENTIFIERS=$preRelease" >> $env:GITHUB_ENV
-          "MINVERIGNOREHEIGHT=true" >> $env:GITHUB_ENV
+          $gitDescribe = git describe --tags --abbrev=0 2>$null
+          if ($gitDescribe -match '^v?(\d+\.\d+\.\d+)') {
+            $baseVersion = $matches[1]
+            
+            $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
+            $version = "$baseVersion-octopus-$branchName.${{ github.run_number }}"
+            
+            "MINVERVERSIONOVERRIDE=$version" >> $env:GITHUB_ENV
+          } 
         shell: pwsh
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release