More

Author: stevencl840

.github/workflows/ci.yml

@@ -32,15 +32,19 @@ jobs:
           dotnet-version: 9.0.x
       - name: Build
         run: |
+          # if it is a pull request build set the build identity to branchname.runnumber
           if ("${{ github.event_name }}" -eq "pull_request" -and "${{ github.head_ref }}" -ne "") {
             $branchName = "${{ github.head_ref }}" -replace '[/\\]', '-' -replace '[^a-zA-Z0-9\-]', ''
-            $preReleaseId = "$branchName.${{ github.run_number }}"
+            $buildIdentity = "$branchName.${{ github.run_number }}"
             
-            Write-Host "PR build - setting pre-release identifiers to: $preReleaseId (height ignored)"
-            $env:IS_BRANCH_BUILD = "true"
-            $env:BRANCH_PRE_RELEASE_ID = $preReleaseId
+            $env:BUILD_IDENTITY = $buildIdentity
           }
           
+          # if it is a scheduled build set the build identity to nightly
+          if ("${{ github.event_name }}" -eq "schedule" -or ${{ inputs.nightly }}) {
+            $env:BUILD_IDENTITY = "nightly.${{ github.run_number }}"
+          }
+
           dotnet build LibGit2Sharp.sln --configuration Release
         shell: pwsh
       - name: Show version
@@ -134,17 +138,8 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           path: staging
-      - name: Push package to feed 🐙 (nightly)
-        if: github.event_name == 'schedule' || inputs.nightly
-        id: push-feed-nightly
-        shell: bash
-        env:
-          FEED_API_KEY: ${{ secrets.FEED_API_KEY }}
-          FEED_SOURCE: ${{ secrets.FEED_SOURCE }}
-        run: dotnet nuget push staging/**/*.nupkg --api-key "$FEED_API_KEY" --source "$FEED_SOURCE" --skip-duplicate
       - name: Push package to feed 🐙 (regular)
-        if: github.event_name != 'schedule' && !inputs.nightly
-        id: push-feed-regular
+        id: push-feed
         shell: bash
         env:
           FEED_API_KEY: ${{ secrets.FEED_API_KEY }}

LibGit2Sharp/LibGit2Sharp.csproj

@@ -21,21 +21,17 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Octopus.LibGit2Sharp</PackageId>
     <PackageOutputPath>$(ArtifactsPath)\package</PackageOutputPath>
-    <MinVerDefaultPreReleaseIdentifiers>octopus-sjc-test-1234</MinVerDefaultPreReleaseIdentifiers>
+    <MinVerDefaultPreReleaseIdentifiers>octopus.0</MinVerDefaultPreReleaseIdentifiers>  
     <MinVerBuildMetadata Condition="'$(libgit2_hash)' != ''">libgit2-$(libgit2_hash.Substring(0,7))</MinVerBuildMetadata>
   </PropertyGroup>
-
+  
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
-
-  <!-- <PropertyGroup Condition="'$(IS_BRANCH_BUILD)' == ''">
-    <MinVerDefaultPreReleaseIdentifiers>octopus.0</MinVerDefaultPreReleaseIdentifiers>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(IS_BRANCH_BUILD)' != ''">
-
-  </PropertyGroup> -->
+  
+  <PropertyGroup Condition="'$(BUILD_IDENTITY)' != ''">
+    <MinVerDefaultPreReleaseIdentifiers>octopus-$(BUILD_IDENTITY)</MinVerDefaultPreReleaseIdentifiers>
+  </PropertyGroup> 
 
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.323]" PrivateAssets="none" />