Merge branch 'develop'

Author: varndellwagglebee

.github/workflows/create-release.yml

@@ -16,71 +16,84 @@ on:
         default: patch
         required: true
 
+permissions:
+  contents: write
+  pull-requests: write
+  packages: write
+
 jobs:
   validate_branch:
     runs-on: ubuntu-latest
-
-    # Expose the file path to downstream jobs
     outputs:
       version_json_path: ${{ steps.locate_version.outputs.file }}
-
     steps:
-      # Checkout the branch we’re releasing *from*
       - name: Checkout target branch
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
           ref: ${{ inputs.target_branch }}
 
-      # Optional sanity check (keeps the job obvious when the ref is wrong)
-      - name:  Ensure target branch exists
+      - name: Ensure target branch exists
         run: |
           if ! git rev-parse --verify --quiet "refs/heads/${{ inputs.target_branch }}"; then
             echo "::error::Ref '${{ inputs.target_branch }}' not found."
             exit 1
           fi
 
-      # Find version.json and emit its absolute path
       - name: Locate version.json
         id: locate_version
         shell: bash
         run: |
-          # Search Git-tracked files first …
           REL_PATH=$(git ls-files --full-name '*version.json' | head -n1)
-
-          # … fall back to a filesystem search for untracked files (optional)
           if [[ -z "$REL_PATH" ]]; then
             REL_PATH=$(find . -type f -name version.json | head -n1 | sed 's|^\./||')
           fi
-
           if [[ -z "$REL_PATH" ]]; then
             echo "::error::version.json not found on branch '${{ inputs.target_branch }}'."
-            tree -L 2 -C || true
             exit 1
           fi
+          echo "file=$GITHUB_WORKSPACE/$REL_PATH" >> "$GITHUB_OUTPUT"
 
-          ABS_PATH="$GITHUB_WORKSPACE/$REL_PATH"
-          echo "Found version.json at: $ABS_PATH"
-
-          # Pass the path to other jobs
-          echo "file=$ABS_PATH" >> "$GITHUB_OUTPUT"
-
-  prepare:
+  prepare-main:
     needs: validate_branch
+    if: ${{ inputs.target_branch == 'main'}}
     uses: Stillpoint-Software/shared-workflows/.github/workflows/nbgv_prepare_release.yml@main
     with:
       target_branch:     ${{ inputs.target_branch }}
       increment:         ${{ inputs.increment }}
       version_file_path: ${{ needs.validate_branch.outputs.version_json_path }}
     secrets: inherit
 
-  publish:
-    needs: prepare
+  prepare-develop:
+    needs: validate_branch
+    if: ${{ inputs.target_branch == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/nbgv_prepare_release.yml@develop
+    with:
+      target_branch:     ${{ inputs.target_branch }}
+      increment:         ${{ inputs.increment }}
+      version_file_path: ${{ needs.validate_branch.outputs.version_json_path }}
+    secrets: inherit
+
+  publish-main:
+    needs: prepare-main
+    if: ${{ inputs.target_branch == 'main' || inputs.target_branch == 'master' }}
     uses: Stillpoint-Software/shared-workflows/.github/workflows/nbgv_dotnet_pack.yml@main
     with:
-      checkout_ref:         ${{ needs.prepare.outputs.release_branch }}
-      build_configuration:  ${{ inputs.target_branch == 'develop' && 'Develop' || 'Release' }}
+      checkout_ref:         ${{ needs.prepare-main.outputs.release_branch }}
+      build_configuration:  Release
+      push_after_pack:      true
+      force_dev_prerelease: false
+    secrets:
+      NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+
+  publish-develop:
+    needs: prepare-develop
+    if: ${{ inputs.target_branch == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/nbgv_dotnet_pack.yml@develop
+    with:
+      checkout_ref:         ${{ needs.prepare-develop.outputs.release_branch }}
+      build_configuration:  Develop
       push_after_pack:      true
-      force_dev_prerelease: ${{ inputs.target_branch == 'develop' }}
+      force_dev_prerelease: true
     secrets:
       NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

.github/workflows/create-test-report.yml

@@ -0,0 +1,77 @@
+name: Create Test Report
+on:
+  workflow_run:
+    workflows: ["Test"]
+    types:     [completed]
+    branches:  [main, develop]
+
+  workflow_dispatch:
+    inputs:
+      test_run_id:
+        description: "Run ID of the completed Test workflow (see the URL)"
+        required: true
+        type: string
+      branch:
+        description: "Branch that Test was run on"
+        required: true
+        type: choice
+        options:  [main, develop]
+        default: develop
+
+permissions:
+  contents: read
+  actions:  read
+  checks:   write
+  
+jobs:
+  discover-auto:
+    runs-on: ubuntu-latest   
+    if: ${{ github.event_name == 'workflow_run' }}   # ← then the condition
+    outputs:
+      branch_name: ${{ steps.meta.outputs.branch }}
+      sha:         ${{ steps.meta.outputs.sha }}
+      run_id:      ${{ steps.meta.outputs.run_id }}
+    steps:
+      - id: meta
+        run: |
+          echo "branch=${{ github.event.workflow_run.head_branch }}" >> "$GITHUB_OUTPUT"
+          echo "sha=${{    github.event.workflow_run.head_sha    }}" >> "$GITHUB_OUTPUT"
+          echo "run_id=${{ github.event.workflow_run.id }}"          >> "$GITHUB_OUTPUT"
+        
+  report-auto-main:
+    needs: discover-auto
+    if: ${{ github.event_name == 'workflow_run' &&
+          needs.discover-auto.result == 'success' &&
+          needs.discover-auto.outputs.branch_name == 'main' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/test-report.yml@main
+    with:
+      test_run_id: ${{ needs.discover-auto.outputs.run_id }}
+      branch:      main          
+    secrets: inherit
+
+  report-auto-develop:
+    needs: discover-auto
+    if: ${{ github.event_name == 'workflow_run' &&
+          needs.discover-auto.result == 'success' &&
+          needs.discover-auto.outputs.branch_name == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/test-report.yml@develop
+    with:
+      test_run_id: ${{ needs.discover-auto.outputs.run_id }}
+      branch:      develop      
+    secrets: inherit
+  
+  report-manual-main:
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.branch == 'main' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/test-report.yml@main
+    with:
+      test_run_id: ${{ inputs.test_run_id }}
+      branch:      main
+    secrets: inherit
+    
+  report-manual-develop:
+    if: ${{ github.event_name == 'workflow_dispatch' && inputs.branch == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/test-report.yml@develop
+    with:
+      test_run_id: ${{ inputs.test_run_id }}
+      branch:      develop
+    secrets: inherit

.github/workflows/format.yml

@@ -1,26 +1,68 @@
 name: Format
 
-on: 
+on:
   push:
-  workflow_run: 
-    workflows: 
-      - Create Prerelease
-      - Create Release
-    types: [requested]
   workflow_dispatch:
   pull_request:
     types: [opened, edited, synchronize, reopened]
-    branches:
-      - main
-      - develop
+    branches: [main, develop]
+
+  workflow_run:
+    workflows: [Create Prerelease, Create Release]
+    types: [requested]
+    branches: [main, develop]     
+
+permissions:
+  contents: read
+  actions: read                
 
 jobs:
-  format:
+   discover:
+    runs-on: ubuntu-latest
+    outputs:
+      branch_name: ${{ steps.set_branch.outputs.branch_name }}
+
+    steps:
+      - id: set_branch
+        shell: bash
+        run: |
+          # 1. Pick the raw branch/ref for each trigger type
+          if [[ "${{ github.event_name }}" == "workflow_run" ]]; then
+            RAW='${{ github.event.workflow_run.head_branch }}'   
+          elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            RAW='${{ github.event.pull_request.base.ref }}'       
+          else                                                    
+            RAW='${{ github.ref }}'                                
+          fi
+
+          # 2. Strip the refs/heads/ prefix if present
+          CLEAN="${RAW#refs/heads/}"
+
+          echo "Detected branch: $CLEAN"
+          echo "branch_name=$CLEAN" >> "$GITHUB_OUTPUT"
+    
+   show-branch:
+    needs: discover
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print branch_name from discover
+        run: |
+          echo "::notice title=branch_name::'${{ needs.discover.outputs.branch_name }}'"
+  
+   format-main:
+    needs: discover
+    if: ${{ needs.discover.outputs.branch_name == 'main' }}
     uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@main
     with:
       dotnet_version: "9.0.x"
     secrets:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
-
-
+   format-develop:
+    needs: discover
+    if: ${{ needs.discover.outputs.branch_name == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/format.yml@develop
+    with:
+      dotnet_version: "9.0.x"
+    secrets:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/issue-branch.yml

@@ -1,19 +1,45 @@
 name: Create Issue Branch
 
 on:
-  # The issue.opened event below is only needed for the "immediate" mode.
-  # The issue.assigned event below is only needed for the default ("auto") mode.
   issues:
-    types: [ opened, assigned ]
-  # The issue_comment.created event below is only needed for the ChatOps mode.
+    types: [ opened, assigned ]           # “immediate” / “auto” modes
   issue_comment:
-    types: [ created ]
-    # The pull_request events below are only needed for pull-request related features.
+    types: [ created ]                    # ChatOps mode
   pull_request:
-    types: [ opened, closed ]
+    types: [ opened, closed ]             # PR-related features
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
 
 jobs:
-  create_issue_branch_job:
+  discover:
+    runs-on: ubuntu-latest
+    outputs:
+      branch_name: ${{ steps.set_branch.outputs.branch_name }}
+    steps:
+      - name: Determine target branch
+        id: set_branch
+        run: echo "branch_name=${BRANCH}" >> "$GITHUB_OUTPUT"
+        env:
+          BRANCH: >-
+            ${{ github.event_name == 'pull_request'
+                && github.event.pull_request.base.ref
+                || 'main' }}
+
+  create-issue-branch-main:
+    needs: discover
+    if: ${{ needs.discover.outputs.branch_name == 'main'}}
     uses: Stillpoint-Software/shared-workflows/.github/workflows/create-issue-branch.yml@main
     secrets:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  create-issue-branch-develop:
+    needs: discover
+    if: ${{ needs.discover.outputs.branch_name == 'develop' }}
+    uses: Stillpoint-Software/shared-workflows/.github/workflows/create-issue-branch.yml@develop
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+