Merge pull request #66969 from dwoz/merge/3007.x/3006.x

[3007.x] Merge forward 3006.x into 3007.x
saltstack · Oct 17, 2024 · ef2fb24 · ef2fb24
2 parents 23b2f65 + 9b157d7
commit ef2fb24
Show file tree

Hide file tree

Showing 30 changed files with 884 additions and 1,006 deletions.
diff --git a/.github/workflows/build-deps-ci-action.yml b/.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: |

diff --git a/.github/workflows/build-docs.yml b/.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 }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml