Merge main into releases/v2 (#1287)

* Update changelog and version after v2.1.26

* Update checked-in dependencies

* Don't check for Go logs on failure (#1279)

* Update supported GitHub Enterprise Server versions. (#1275)

Co-authored-by: GitHub <noreply@github.com>

* TRAP Caching: Add timeouts to upload/download operations

* Add logging statements declaring state of the cli_config_file_enabled

It's possible to determine this otherwise, but this makes it easier to
spot.

* Avoid using single value as array

The user config parser in the CLI doesn't yet support it.

* Extract logging statements to separate function

* Correctly report CodeQL version when using cache (#1259)

* Correctly report CodeQL version when using cache

* Add JS generated files

* Add test for return value of `setupCodeQL`

* Fill in missing return value comment

* Convert "Invalid source root" errors to UserErrors

* Add changelog note for Go extraction reconciliation (#1286)

* Add changelog note for Go extraction reconciliation

* Update CHANGELOG.md

Co-authored-by: Henry Mercer <henrymercer@github.com>

* Update CHANGELOG.md

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

* Tweaks from PR review

Co-authored-by: Henry Mercer <henrymercer@github.com>
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

* Update changelog for v2.1.27

Co-authored-by: github-actions[bot] <github-actions@github.com>
Co-authored-by: Chuan-kai Lin <cklin@github.com>
Co-authored-by: Angela P Wen <angelapwen@github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub <noreply@github.com>
Co-authored-by: Edoardo Pirovano <edoardo.pirovano@gmail.com>
Co-authored-by: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com>
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
Co-authored-by: Henry Mercer <henrymercer@github.com>
This commit is contained in:
github-actions[bot] 2022-10-06 23:17:09 +00:00 committed by GitHub
parent e0e5ded33c
commit 807578363a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 341 additions and 93 deletions

View file

@ -3,8 +3,10 @@ name: "Check SARIF for default queries with Single include, Single exclude"
query-filters:
# This should run js/path-injection and js/zipslip
- include:
tags contain: external/cwe/cwe-022
tags contain:
- external/cwe/cwe-022
# Removes js/path-injection
- exclude:
id: js/path-injection
id:
- js/path-injection

View file

@ -10,12 +10,15 @@ packs:
query-filters:
# This should run js/path-injection and js/zipslip
- include:
tags contain: external/cwe/cwe-022
tags contain:
- external/cwe/cwe-022
# Removes js/path-injection
- exclude:
id: js/path-injection
id:
- js/path-injection
# Query from extra pack
- include:
id: javascript/example/empty-or-one-block
id:
- javascript/example/empty-or-one-block

View file

@ -20,16 +20,20 @@ packs:
query-filters:
# This should run js/path-injection and js/zipslip
- include:
tags contain: external/cwe/cwe-022
tags contain:
- external/cwe/cwe-022
# Removes js/path-injection
- exclude:
id: js/path-injection
id:
- js/path-injection
# Query from extra pack
- include:
id: javascript/example/empty-or-one-block
id:
- javascript/example/empty-or-one-block
# Local query
- include:
id: inrepo-javascript-querypack/show-ifs
id:
- inrepo-javascript-querypack/show-ifs