Merge pull request #65913 from s0undt3ch/hotfix/merge-forward

[master] Merge 3007.x into master

.github/actions/download-artifact/action.yml

@@ -23,7 +23,9 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v3
+      # This needs to be actions/download-artifact@v3 because we upload multiple artifacts
+      # under the same name something that actions/upload-artifact@v4 does not do.
       with:
         name: ${{ inputs.name }}
         path: ${{ inputs.path }}

.github/actions/upload-artifact/action.yml

@@ -45,7 +45,9 @@ runs:
         shopt -s globstar || echo "'globstar' not available"
         tar -cavf ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz ${{ inputs.path }}
 
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v3
+      # This needs to be actions/upload-artifact@v3 because we upload multiple artifacts
+      # under the same name something that actions/upload-artifact@v4 does not do.
       with:
         name: ${{ inputs.name }}
         path: ${{ inputs.archive-name || inputs.name || 'archive' }}.tar.gz

.github/workflows/nightly.yml

@@ -2946,7 +2946,9 @@ jobs:
           cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
       - name: Download Repository Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
+        # This needs to be actions/download-artifact@v3 because we upload multiple artifacts
+        # under the same name something that actions/upload-artifact@v4 does not do.
         with:
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-nightly-repo
           path: repo/

.github/workflows/staging.yml

@@ -2753,7 +2753,9 @@ jobs:
           cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
       - name: Download Repository Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
+        # This needs to be actions/download-artifact@v3 because we upload multiple artifacts
+        # under the same name something that actions/upload-artifact@v4 does not do.
         with:
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-staging-repo
           path: repo/

.github/workflows/templates/nightly.yml.jinja

@@ -170,7 +170,9 @@ concurrency:
           cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
       - name: Download Repository Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
+        # This needs to be actions/download-artifact@v3 because we upload multiple artifacts
+        # under the same name something that actions/upload-artifact@v4 does not do.
         with:
           name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-<{ gh_environment }>-repo
           path: repo/

requirements/static/ci/py3.12/windows.txt

@@ -440,8 +440,6 @@ smmap==5.0.0
     # via gitdb
 sqlparse==0.4.4
     # via -r requirements/static/ci/common.in
-sspilib==0.1.0
-    # via pyspnego
 strict-rfc3339==0.7
     # via -r requirements/static/ci/common.in
 tempora==5.3.0

tools/ci.py

@@ -655,7 +655,7 @@ def matrix(
     _matrix = []
     _splits = {
         "functional": 3,
-        "integration": 5,
+        "integration": 6,
         "scenarios": 1,
         "unit": 4,
     }