Bit of a mess

Author: stevencl840

.github/workflows/ci.yml

@@ -30,18 +30,24 @@ jobs:
         uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 9.0.x
-      - name: Set nightly version
-        if: github.event_name == 'schedule' || inputs.nightly
+      - name: Set version
         run: |
-          $gitVersion = git describe --tags --abbrev=0 2>$null
-          if ($gitVersion -match '^v?(\d+\.\d+\.\d+)') {
-            $baseVersion = $matches[1]
+          if ("${{ github.event_name }}" -eq "schedule" -or "${{ inputs.nightly }}" -eq "true") {
+            # Nightly build - override with specific format
+            $gitVersion = git describe --tags --abbrev=0 2>$null
+            if ($gitVersion -match '^v?(\d+\.\d+\.\d+)') {
+              $baseVersion = $matches[1]
+            } else {
+              $baseVersion = "0.32.0"
+            }
+            $version = "$baseVersion-octopus-nightly-${{ github.run_number }}"
+            Write-Host "Setting nightly version to: $version"
+            "MINVERVERSIONOVERRIDE=$version" >> $env:GITHUB_ENV
           } else {
-            $baseVersion = "0.32.0"
+            # Regular build - let MinVer calculate from tags/height, just ensure octopus is in default
+            Write-Host "Using MinVer with default pre-release: octopus.${{ github.run_number }}"
+            "MINVERDEFAULTPRERELEASEIDENTIFIERS=octopus.${{ github.run_number }}" >> $env:GITHUB_ENV
           }
-          $nightlyVersion = "$baseVersion-octopus-nightly-${{ github.run_number }}"
-          Write-Host "Setting nightly version to: $nightlyVersion"
-          "MINVERVERSIONOVERRIDE=$nightlyVersion" >> $env:GITHUB_ENV
         shell: pwsh
       - name: Build
         run: dotnet build LibGit2Sharp.sln --configuration Release