Skip to content

Commit 0c3e493

Browse files
committed
Update first version of CLI compatible with Windows 2022
It is 2.8.2, not 2.7.3.
1 parent e131232 commit 0c3e493

16 files changed

+35
-45
lines changed

.github/workflows/__analyze-ref-input.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-custom-queries.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-custom-tracing-autobuild.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-custom-tracing.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-reconciled-tracing-autobuilder.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-reconciled-tracing-custom-build-steps.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__go-reconciled-tracing-legacy-workflow.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__ml-powered-queries.yml

+8-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__multi-language-autodetect.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__remote-config.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__unset-environment.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__upload-ref-sha-input.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/__with-checkout-path.yml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/debug-artifacts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
version: stable-20211005
2525
- os: macos-latest
2626
version: stable-20211005
27-
- os: ubuntu-latest
27+
- os: ubuntu-20.04
2828
version: stable-20220120
2929
- os: macos-latest
3030
version: stable-20220120
@@ -84,7 +84,7 @@ jobs:
8484
VERSIONS="stable-20211005 stable-20220120 stable-20220401 cached latest nightly-latest"
8585
LANGUAGES="cpp csharp go java javascript python"
8686
for version in $VERSIONS; do
87-
if [[ "$version" == stable-20211005 ]]; then
87+
if [[ "$version" =~ stable-(20211005|20220120|20210809) ]]; then
8888
# Note the absence of the period in "ubuntu-2004": this is present in the image name
8989
# but not the artifact name
9090
OPERATING_SYSTEMS="ubuntu-2004 macos-latest"

pr-checks/checks/ml-powered-queries.yml

+4-9
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,17 @@ steps:
3333

3434
- name: Check sarif
3535
uses: ./../action/.github/check-sarif
36-
if: matrix.os != 'windows-latest' || matrix.version == 'latest' || matrix.version == 'nightly-latest'
36+
# Running on Windows requires CodeQL CLI 2.9.0+.
37+
if: "!(matrix.version == 'stable-20220120' && (matrix.os == 'windows-latest' || matrix.os == 'windows-2019'))"
3738
with:
3839
sarif-file: ${{ runner.temp }}/results/javascript.sarif
3940
queries-run: js/ml-powered/nosql-injection,js/ml-powered/path-injection,js/ml-powered/sql-injection,js/ml-powered/xss
4041
queries-not-run: foo,bar
4142

4243
- name: Check results
43-
# Running ML-powered queries on Windows requires CodeQL CLI 2.9.0+. We don't run these checks
44-
# against Windows and `cached` while CodeQL CLI 2.9.0 makes its way into `cached` to avoid the
45-
# test starting to fail when the cached CodeQL Bundle gets updated. Once the CodeQL Bundle
46-
# containing CodeQL CLI 2.9.0 has been fully released, we can drop this line and start running
47-
# these checks on Windows and `cached`.
48-
if: matrix.os != 'windows-latest' || matrix.version != 'cached'
4944
env:
50-
# Running on Windows requires CodeQL CLI 2.9.0+, which has so far only made it to 'latest'.
51-
SHOULD_RUN_ML_POWERED_QUERIES: ${{ matrix.os != 'windows-latest' || matrix.version == 'latest' || matrix.version == 'nightly-latest' }}
45+
# Running on Windows requires CodeQL CLI 2.9.0+.
46+
SHOULD_RUN_ML_POWERED_QUERIES: ${{ !(matrix.version == 'stable-20220120' && (matrix.os == 'windows-latest' || matrix.os == 'windows-2019')) }}
5247
shell: bash
5348
run: |
5449
echo "Expecting ML-powered queries to be run: ${SHOULD_RUN_ML_POWERED_QUERIES}"

pr-checks/sync.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def isCompatibleWithLatestImages(version):
2323
return True
2424
date = version.split("-")[1]
2525
# The first version of the CodeQL CLI compatible with `ubuntu-22.04` and `windows-2022` is
26-
# 2.7.3. This appears in CodeQL Bundle version codeql-bundle-20211208.
27-
return date >= "20211208"
26+
# 2.8.2. This appears in CodeQL Bundle version codeql-bundle-20220224.
27+
return date >= "20220224"
2828

2929

3030
def operatingSystemsForVersion(version):

0 commit comments

Comments
 (0)