Merge remote-tracking branch 'origin/main' into jest-migration/integration-tests

.github/workflows/main.yml

@@ -185,7 +185,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.3', 'nightly']
+        version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.4', 'nightly']
     env:
       CLI_VERSION: ${{ matrix.version }}
       NIGHTLY_URL: ${{ needs.find-nightly.outputs.url }}

extensions/ql-vscode/src/vscode-tests/ensureCli.ts

@@ -38,7 +38,7 @@ const _10MB = _1MB * 10;
 
 // CLI version to test. Hard code the latest as default. And be sure
 // to update the env if it is not otherwise set.
-const CLI_VERSION = process.env.CLI_VERSION || "v2.11.3";
+const CLI_VERSION = process.env.CLI_VERSION || "v2.11.4";
 process.env.CLI_VERSION = CLI_VERSION;
 
 // Base dir where CLIs will be downloaded into

extensions/ql-vscode/test/pure-tests/variant-analysis-filter-sort.test.ts

@@ -6,9 +6,8 @@ import {
   filterAndSortRepositoriesWithResultsByName,
   matchesFilter,
   SortKey,
-} from "../../../pure/variant-analysis-filter-sort";
+} from "../../src/pure/variant-analysis-filter-sort";
 
-// TODO: Move this file to the "pure" tests once it has been switched to Jest
 describe(matchesFilter.name, () => {
   const repository = {
     fullName: "github/codeql",