ci: Count revision separately for each branch.

Author: freezy

.github/workflows/build.yml

@@ -15,6 +15,9 @@ jobs:
       matrix:
         platform: [x86, x64]
         configuration: [Release]
+    concurrency:
+        group: ${{ github.workflow }}-${{ github.ref }}
+        cancel-in-progress: false
     env:
       NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
     steps:
@@ -54,9 +57,36 @@ jobs:
       - name: Restore DLLExport dependency
         run: .\DllExport -action Restore -sln-file DmdExtensions.sln
 
+      - name: Compute per-branch build number
+        id: branch_build
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: pwsh
+        run: |
+          $ownerRepo = "${{ github.repository }}"
+          $branch    = if ($env:GITHUB_HEAD_REF) { $env:GITHUB_HEAD_REF } else { $env:GITHUB_REF_NAME }
+          
+          # Parse the workflow file name from workflow_ref: owner/repo/.github/workflows/<file>@<ref>
+          $wfRef = "${{ github.workflow_ref }}"
+          if ($wfRef -match "\.github/workflows/(?<file>[^@]+)@") { $wfFile = $matches.file } else { throw "Couldn't parse workflow file from workflow_ref" }
+          
+          $uri = "https://api.github.com/repos/$ownerRepo/actions/workflows/$wfFile/runs?branch=$branch&per_page=1"
+          $headers = @{
+            Authorization = "Bearer $env:GH_TOKEN"
+            "X-GitHub-Api-Version" = "2022-11-28"
+            "User-Agent" = "branch-counter"
+          }
+          
+          $resp = Invoke-RestMethod -Uri $uri -Headers $headers -Method GET
+          # total_count includes this current run, which is what we want (first run => 1)
+          $count = [int]$resp.total_count
+          "number=$count" >> $env:GITHUB_OUTPUT  
+
       - name: Update version info
         id: set_version
         shell: pwsh
+        env:
+          BRANCH_BUILD: ${{ steps.branch_build.outputs.number }}
         run: |
           function replaceNumericVersion($name, $fileContent) {
             $RegularExpression = [regex] "^[^/]*\[assembly:\s*$name\(\""(\d+)\.(\d+)\.(\d+)(\.(\d+))?\""\)"
@@ -66,11 +96,11 @@ jobs:
                 $major=$match.groups[1].value -as [int]
                 $minor=$match.groups[2].value -as [int]
                 $patch=$match.groups[3].value -as [int]
-                return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$major.$minor.$patch.$env:GITHUB_RUN_NUMBER"")]".TrimEnd("]")  # remove trailing ]
+                return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$major.$minor.$patch.$env:BRANCH_BUILD"")]".TrimEnd("]")
               }
             }
           }
-
+          
           function replaceFullVersion($name, $fileContent) {
             $RegularExpression = [regex] "[^/]*\[assembly:\s*$name\(\""(\d)\.(\d)\.(\d)(-([\w\W]+))?\""\)"
             foreach($content in $fileContent) {
@@ -80,21 +110,21 @@ jobs:
                 $minor=$match.groups[2].value -as [int]
                 $patch=$match.groups[3].value -as [int]
                 $tag=$match.groups[5].value
-
+          
                 $branch = if ($env:GITHUB_HEAD_REF) { $env:GITHUB_HEAD_REF } else { $env:GITHUB_REF_NAME }
                 if ($branch -eq "master" -or $branch -eq "main") {
-                  if ($tag) { $version = "$major.$minor.$patch-$tag-r$env:GITHUB_RUN_NUMBER" }
-                  else { $version = "$major.$minor.$patch-r$env:GITHUB_RUN_NUMBER" }
+                  if ($tag) { $version = "$major.$minor.$patch-$tag-r$env:BRANCH_BUILD" }
+                  else { $version = "$major.$minor.$patch-r$env:BRANCH_BUILD" }
                 } else {
-                  $version = "$major.$minor.$patch-$($branch.ToUpper())-r$env:GITHUB_RUN_NUMBER"
+                  $version = "$major.$minor.$patch-$($branch.ToUpper())-r$env:BRANCH_BUILD"
                 }
-
+          
                 "version=$version" >> $env:GITHUB_OUTPUT
                 return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$version"")]".TrimEnd("]")
               }
             }
           }
-
+          
           function replaceAny($name, $replaceWith, $fileContent) {
             $RegularExpression = [regex] "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)"
             foreach($content in $fileContent) {
@@ -104,7 +134,7 @@ jobs:
               }
             }
           }
-
+          
           $assemblyFile = "VersionAssemblyInfo.cs"
           $fileContent = Get-Content $assemblyFile
           $fileContent = replaceNumericVersion 'AssemblyVersion' $fileContent
@@ -115,6 +145,7 @@ jobs:
           }
           $fileContent | Set-Content "$assemblyFile"
 
+
       - name: Build
         run: msbuild -t:rebuild /p:Platform=${{ matrix.platform }} /p:Configuration=${{ matrix.configuration }} DmdExtensions.sln
 
@@ -189,4 +220,4 @@ jobs:
           name: dmdext-v${{ steps.set_version.outputs.version }}-${{ matrix.platform }}-msi
           path: ${{ github.workspace }}\Installer\Builds\dmdext-v${{ steps.set_version.outputs.version }}-${{ matrix.platform }}.msi
           retention-days: 90
-          if-no-files-found: error
+          if-no-files-found: error