merged 3.0.0 into dev for git history alignment [skip ci]

.azure/azure-benchmark-pipeline.yaml

@@ -1,9 +1,5 @@
 trigger:
-  branches:
-    exclude:
-    - '*'
-    include:
-    - 'refs/heads/release/*'
+- release/*
 
 schedules:
 - cron: "0 2 * * 1-5"  # Run at 2 AM every weekday
@@ -61,23 +57,6 @@ jobs:
       cd ..
     displayName: 'Run Benchmarking Script'
 
-  - script: |
-      git config --global user.email "oss@dstl.gov.uk"
-      git config --global user.name "Defence Science and Technology Laboratory UK"
-    workingDirectory: $(System.DefaultWorkingDirectory)
-    displayName: 'Configure Git'
-    condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
-
-  - script: |
-      git add benchmark/results/v$(MAJOR_VERSION)/v$(VERSION)/*
-      git commit -m "Automated benchmark output commit for version $(VERSION)"
-      git push origin HEAD:refs/heads/$(Build.SourceBranchName)
-    displayName: 'Commit and Push Benchmark Results'
-    workingDirectory: $(System.DefaultWorkingDirectory)
-    env:
-      GIT_CREDENTIALS: $(System.AccessToken)
-    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
-
   - script: |
       tar czf primaite_v$(VERSION)_benchmark.tar.gz benchmark/results/v$(MAJOR_VERSION)/v$(VERSION)
     displayName: 'Prepare Artifacts for Publishing'
@@ -85,6 +64,45 @@ jobs:
   - task: PublishPipelineArtifact@1
     inputs:
       targetPath: primaite_v$(VERSION)_benchmark.tar.gz
-      artifactName: 'benchmark-output'
+      artifactName: 'benchmark-zip-output'
       publishLocation: 'pipeline'
-    displayName: 'Publish Benchmark Output as Artifact'
+    displayName: 'Publish Benchmark Output zip as Artifact'
+
+  - script: |
+      git config --global user.email "oss@dstl.gov.uk"
+      git config --global user.name "Defence Science and Technology Laboratory UK"
+    workingDirectory: $(System.DefaultWorkingDirectory)
+    displayName: 'Configure Git'
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
+
+  - script: |
+      echo "Fetching all branches..."
+      git fetch --all --prune
+
+      echo "Stashing files..."
+      git stash push -u
+
+      echo "Resolving branch name..."
+      # Extracting just the branch name from the full ref path
+      branch_name=$(echo "$(Build.SourceBranch)" | sed 's|refs/heads/||')
+      echo "Branch Name: $branch_name"
+
+      echo "Checking out branch $branch_name..."
+      git checkout $branch_name
+
+      echo "Popping stash..."
+      git stash pop
+
+      echo "Adding benchmark results..."
+      git add benchmark/results/v$(MAJOR_VERSION)/v$(VERSION)/*
+
+      echo "Committing changes..."
+      git commit -m "Automated benchmark output commit for version $(VERSION) [skip ci]"
+
+      echo "Pushing to remote..."
+      git push origin $branch_name
+    displayName: 'Commit and Push Benchmark Results'
+    workingDirectory: $(System.DefaultWorkingDirectory)
+    env:
+      GIT_CREDENTIALS: $(System.AccessToken)
+    condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))