Merge branch '3006.x' into full_3006_bld

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,15 +11,23 @@ Remove this section if not relevant
 
 ### Merge requirements satisfied?
 **[NOTICE] Bug fixes or features added to Salt require tests.**
-<!-- Please review the [test documentation](https://docs.saltproject.io/en/master/topics/tutorials/writing_tests.html) for details on how to implement tests into Salt's test suite. -->
+<!-- Please review the test documentation for details on how to implement tests
+into Salt's test suite:
+https://docs.saltproject.io/en/master/topics/tutorials/writing_tests.html -->
 - [ ] Docs
 - [ ] Changelog - https://docs.saltproject.io/en/master/topics/development/changelog.html
 - [ ] Tests written/updated
 
 ### Commits signed with GPG?
 Yes/No
 
-Please review [Salt's Contributing Guide](https://docs.saltproject.io/en/master/topics/development/contributing.html) for best practices, including the
-[PR Guidelines](https://docs.saltproject.io/en/master/topics/development/pull_requests.html).
+<!-- Please review Salt's Contributing Guide for best practices and guidance in
+choosing the right branch:
+https://docs.saltproject.io/en/master/topics/development/contributing.html -->
 
-See GitHub's [page on GPG signing](https://help.github.com/articles/signing-commits-using-gpg/) for more information about signing commits with GPG.
+<!-- Additional guidance for pull requests can be found here:
+https://docs.saltproject.io/en/master/topics/development/pull_requests.html -->
+
+<!-- See GitHub's page on GPG signing for more information about signing commits
+with GPG:
+https://help.github.com/articles/signing-commits-using-gpg/ -->

.github/workflows/build-deps-ci-action.yml

@@ -56,7 +56,9 @@ jobs:
     env:
       PIP_INDEX_URL: https://pypi.org/simple
     steps:
-
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: "Throttle Builds"
         shell: bash
         run: |

.github/workflows/build-docs.yml

@@ -36,6 +36,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
 
       - name: Download Release Patch
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}