Merge remote-tracking branch 'origin/alexet/update-2.11.4-v2' into henrymercer/bump-swift-version-to-5.7.1

henrymercer · henrymercer · commit 4b578d24bf4e · 2022-11-23T19:20:37.000Z
diff --git a/.github/workflows/__export-file-baseline-information.yml b/.github/workflows/__export-file-baseline-information.yml
diff --git a/.github/workflows/__ml-powered-queries.yml b/.github/workflows/__ml-powered-queries.yml
diff --git a/.github/workflows/__multi-language-autodetect.yml b/.github/workflows/__multi-language-autodetect.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [UNRELEASED]
 
+- Update default CodeQL bundle version to 2.11.4. [#1391](https://github.com/github/codeql-action/pull/1391)
 - Fixed a bug where some the `init` action and the `analyze` action would have different sets of experimental feature flags enabled. [#1384](https://github.com/github/codeql-action/pull/1384)
 
 ## 2.1.33 - 16 Nov 2022
diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json
@@ -1 +1 @@
-{ "maximumVersion": "3.7", "minimumVersion": "3.3" }
+{ "maximumVersion": "3.8", "minimumVersion": "3.3" }
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20221105"
+    "bundleVersion": "codeql-bundle-20221123"
 }
diff --git a/lib/util.js b/lib/util.js
diff --git a/pr-checks/checks/export-file-baseline-information.yml b/pr-checks/checks/export-file-baseline-information.yml
@@ -3,7 +3,7 @@ description: "Tests that file baseline information is exported when the feature
 versions: ["nightly-latest"]
 steps:
   - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9
-    if: "!startsWith(matrix.os, 'windows')"
+    if: runner.os != 'Windows'
     with:
       swift-version: "5.7.1"
   - uses: ./../action/init
diff --git a/pr-checks/checks/ml-powered-queries.yml b/pr-checks/checks/ml-powered-queries.yml
@@ -30,7 +30,7 @@ steps:
   - name: Check sarif
     uses: ./../action/.github/check-sarif
     # Running on Windows requires CodeQL CLI 2.9.0+.
-    if: "!(matrix.version == 'stable-20220120' && (matrix.os == 'windows-latest' || matrix.os == 'windows-2019'))"
+    if: "!(matrix.version == 'stable-20220120' && runner.os == 'Windows')"
     with:
       sarif-file: ${{ runner.temp }}/results/javascript.sarif
       queries-run: js/ml-powered/nosql-injection,js/ml-powered/path-injection,js/ml-powered/sql-injection,js/ml-powered/xss
@@ -39,7 +39,7 @@ steps:
   - name: Check results
     env:
       # Running on Windows requires CodeQL CLI 2.9.0+.
-      SHOULD_RUN_ML_POWERED_QUERIES: ${{ !(matrix.version == 'stable-20220120' && (matrix.os == 'windows-latest' || matrix.os == 'windows-2019')) }}
+      SHOULD_RUN_ML_POWERED_QUERIES: ${{ !(matrix.version == 'stable-20220120' && runner.os == 'Windows') }}
     shell: bash
     run: |
       echo "Expecting ML-powered queries to be run: ${SHOULD_RUN_ML_POWERED_QUERIES}"
diff --git a/pr-checks/checks/multi-language-autodetect.yml b/pr-checks/checks/multi-language-autodetect.yml
@@ -5,7 +5,7 @@ env:
   CODEQL_ENABLE_EXPERIMENTAL_FEATURES_SWIFT: "true" # Remove when Swift is GA.
 steps:
   - uses: swift-actions/setup-swift@5cdaa9161ad1f55ae39a5ea1784ef96de72f95d9
-    if: "!startsWith(matrix.os, 'windows')"
+    if: runner.os != 'Windows'
     with:
       swift-version: "5.7.1"
 
diff --git a/src/api-compatibility.json b/src/api-compatibility.json
@@ -1 +1 @@
-{"maximumVersion": "3.7", "minimumVersion": "3.3"}
+{"maximumVersion": "3.8", "minimumVersion": "3.3"}
diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-  "bundleVersion": "codeql-bundle-20221105"
+  "bundleVersion": "codeql-bundle-20221123"
 }
diff --git a/src/util.ts b/src/util.ts
@@ -651,7 +651,7 @@ export async function checkActionVersion(version: string) {
         ))
     ) {
       core.warning(
-        "CodeQL Action v1 will be deprecated on December 7th, 2022. Please upgrade to v2. For " +
+        "CodeQL Action v1 will be deprecated on January 18th, 2023. Please upgrade to v2. For " +
           "more information, see " +
           "https://github.blog/changelog/2022-04-27-code-scanning-deprecation-of-codeql-action-v1/"
       );

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "maximumVersion": "3.7", "minimumVersion": "3.3" }`
	`1`	`+{ "maximumVersion": "3.8", "minimumVersion": "3.3" }`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "bundleVersion": "codeql-bundle-20221105"`
	`2`	`+ "bundleVersion": "codeql-bundle-20221123"`
`3`	`3`	`}`