Merge remote-tracking branch 'origin/releases/v3' into backport-v2.26.13-f779452ac

.github/workflows/__zstd-bundle-fallback.yml

@@ -29,8 +29,6 @@ jobs:
         include:
           - os: macos-latest
             version: linked
-          - os: windows-latest
-            version: linked
           - os: ubuntu-latest
             version: linked
     name: Zstandard bundle fallback

.github/workflows/__zstd-bundle.yml

@@ -29,10 +29,10 @@ jobs:
         include:
           - os: macos-latest
             version: linked
-          - os: windows-latest
-            version: linked
           - os: ubuntu-latest
             version: linked
+          - os: windows-latest
+            version: linked
     name: Zstandard bundle
     permissions:
       contents: read
@@ -109,9 +109,11 @@ jobs:
             const toolsUrl = downloadTelemetryNotifications[0].properties.attributes.toolsUrl;
             console.log(`Found tools URL: ${toolsUrl}`);
 
-            if (!toolsUrl.endsWith('.tar.zst')) {
+            const expectedExtension = process.env['RUNNER_OS'] === 'Windows' ? '.tar.gz' : '.tar.zst';
+
+            if (!toolsUrl.endsWith(expectedExtension)) {
               core.setFailed(
-                `Expected the tools URL to be a .tar.zst file, but found ${toolsUrl}.`
+                `Expected the tools URL to be a ${expectedExtension} file, but found ${toolsUrl}.`
               );
             }
     env:

.github/workflows/debug-artifacts-failure.yml

@@ -3,6 +3,7 @@
 name: PR Check - Debug artifacts after failure
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CODEQL_ACTION_ARTIFACT_V4_UPGRADE: true
 on:
   push:
     branches:
@@ -61,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Check expected artifacts exist
         shell: bash
         run: |

.github/workflows/debug-artifacts-legacy.yml

@@ -1,9 +1,9 @@
 # Checks logs, SARIF, and database bundle debug artifacts exist and are accessible
-# with download-artifact@v4 when CODEQL_ACTION_ARTIFACT_V4_UPGRADE is set to true.
+# with download-artifact@v3 when CODEQL_ACTION_ARTIFACT_V4_UPGRADE is set to false.
 name: PR Check - Debug artifact upload using artifact@v2
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  CODEQL_ACTION_ARTIFACT_V4_UPGRADE: true
+  CODEQL_ACTION_ARTIFACT_V4_UPGRADE: false
 on:
   push:
     branches:
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
       - name: Check expected artifacts exist
         shell: bash
         run: |

.github/workflows/debug-artifacts.yml

@@ -2,6 +2,7 @@
 name: PR Check - Debug artifact upload
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CODEQL_ACTION_ARTIFACT_V4_UPGRADE: true
 on:
   push:
     branches:
@@ -67,7 +68,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Check expected artifacts exist
         shell: bash
         run: |