Merge branch '3.5.x'

Closes gh-48369

Author: philwebb

.github/workflows/build-and-deploy-snapshot.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Run Deploy Docs Workflow
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
+        run: gh workflow run deploy-docs.yml --repo ${{ github.repository }} -r docs-build -f build-sha=${{ github.sha }} -f build-refname=${{ github.ref_name }} -f build-version=${{ needs.build-and-deploy-snapshot.outputs.version }}
   verify:
     name: Verify
     needs: build-and-deploy-snapshot

.github/workflows/trigger-docs-build.yml

@@ -5,12 +5,16 @@ on:
     paths: [ 'antora/*' ]
   workflow_dispatch:
     inputs:
+      build-version:
+        description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
+        required: false
+      build-sha:
+        description: Enter the SHA to build (e.g. 82c97891569821a7f91a77ca074232e0b54ca7a5)
+        required: false
       build-refname:
         description: 'Git refname to build (e.g., 1.0.x)'
         required: false
-      build-version:
-        description: 'Version being build (e.g. 1.0.3-SNAPSHOT)'
-        required: false  
+
 permissions:
   contents: read
 jobs:
@@ -28,4 +32,4 @@ jobs:
     - name: Trigger Workflow
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-version=${{ github.event.inputs.build-version }}
+      run: gh workflow run deploy-docs.yml -r docs-build -f build-refname=${{ github.event.inputs.build-refname }} -f build-sha=${{ github.event.inputs.build-sha }} -f build-version=${{ github.event.inputs.build-version }}