Skip to content

Merge releases/v2 into releases/v1 #1109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
bfe9d7d
Add Swift as a supported language.
MathiasVP May 27, 2022
16c620d
Make the linter happy.
MathiasVP May 31, 2022
57096f1
Update changelog and version after v2.1.12
invalid-email-address Jun 1, 2022
632cc8e
Update checked-in dependencies
invalid-email-address Jun 1, 2022
69e0990
Merge pull request #1089 from github/mergeback/v2.1.12-to-main-27ea8f8f
aeisenberg Jun 1, 2022
1b5ea4a
Merge branch 'main' into swift-support
MathiasVP Jun 3, 2022
ccf479d
Merge pull request #1085 from github/swift-support
aeisenberg Jun 3, 2022
f7c46e5
Avoid use of rmdir
aeisenberg Jun 13, 2022
29a2159
Merge pull request #1095 from github/aeisenberg/use-del
aeisenberg Jun 14, 2022
0efcf74
Add typings for js-yaml
aeisenberg Jun 13, 2022
bcb7fad
Add the check-sarif action
aeisenberg Jun 14, 2022
40b2800
Add capability to filter queries
aeisenberg Jun 14, 2022
06e27d3
Merge branch 'aeisenberg/js-yaml-typings' into aeisenberg/remove-queries
aeisenberg Jun 14, 2022
eec34d5
Add integration tests for query filters
aeisenberg Jun 14, 2022
81b419c
Merge pull request #1097 from github/aeisenberg/js-yaml-typings
aeisenberg Jun 15, 2022
0ece1d1
add ml query pack 0.3.0
TomBolton Jun 1, 2022
79d8e4a
fix lint errors
TomBolton Jun 13, 2022
f8f4c0b
compile the modified TypeScript to Javascript
TomBolton Jun 13, 2022
a568674
add tests for ML powered queries 0.3.0 and CLI 2.9.3
TomBolton Jun 13, 2022
a27dc4f
update security extended test for all platforms
TomBolton Jun 15, 2022
df05122
Merge pull request #1087 from github/tombolton/update-ml-pack
TomBolton Jun 15, 2022
428caf0
Update changelog
aeisenberg Jun 15, 2022
4918636
Clarify variable names in new action
aeisenberg Jun 15, 2022
6834383
Apply suggestions from code review
aeisenberg Jun 15, 2022
59ca9b5
Extract query-filters test into a composite action
aeisenberg Jun 15, 2022
97f9db4
Update supported GitHub Enterprise Server versions.
web-flow Jun 16, 2022
777b778
Spelling, capitalization, and better descriptions
aeisenberg Jun 16, 2022
6db77ee
Merge remote-tracking branch 'upstream/main' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
d7459f0
Merge branch 'aeisenberg/check-sarif-action' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
d2ab7a2
Merge pull request #1086 from github/update-supported-enterprise-serv…
henrymercer Jun 16, 2022
ee4575b
Merge branch 'main' into aeisenberg/check-sarif-action
aeisenberg Jun 16, 2022
7c412c6
Merge branch 'aeisenberg/check-sarif-action' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
80ecdcd
Merge pull request #1098 from github/aeisenberg/remove-queries
aeisenberg Jun 16, 2022
2e80c74
Merge pull request #1096 from github/aeisenberg/check-sarif-action
aeisenberg Jun 16, 2022
c7785f6
Fix input to action
aeisenberg Jun 17, 2022
2e111b2
Merge pull request #1102 from github/aeisenberg/fix-query-filters-test
aeisenberg Jun 17, 2022
7adb33d
Ensure there are no duplicates when sending up required checks
aeisenberg Jun 17, 2022
30fe0a5
Merge pull request #1103 from github/aeisenberg/fix-required-checks-s…
aeisenberg Jun 17, 2022
ccf5d70
Update default CodeQL version to 2.9.4
edoardopirovano Jun 15, 2022
31367d4
Merge pull request #1100 from github/edoardo/2.9.4-bump
edoardopirovano Jun 20, 2022
8bd4419
Update changelog for v2.1.13
invalid-email-address Jun 21, 2022
d00e8c0
Merge pull request #1107 from github/update-v2.1.13-31367d4e
edoardopirovano Jun 21, 2022
9d650fd
Revert "Update version and changelog for v1.1.12"
invalid-email-address Jun 21, 2022
3b2cf89
Revert "Update checked-in dependencies"
invalid-email-address Jun 21, 2022
4d013d7
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.13…
invalid-email-address Jun 21, 2022
e47f040
Update version and changelog for v1.1.13
invalid-email-address Jun 21, 2022
c053e94
Update checked-in dependencies
invalid-email-address Jun 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Spelling, capitalization, and better descriptions
  • Loading branch information
aeisenberg committed Jun 16, 2022
commit 777b778409befa0ba120d2fd32f0c1d165ba9849
6 changes: 3 additions & 3 deletions .github/query-filter-test/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Query Filter Test
description: Runs a test of query filters using the check sarif action
description: Runs a test of query filters using the check SARIF action
inputs:
sarif-file:
required: true
description: The sarif file to check
description: The SARIF file to check

queries-run:
required: true
Expand Down Expand Up @@ -41,7 +41,7 @@ runs:
upload: false
env:
TEST_MODE: "true"
- name: Check Sarif
- name: Check SARIF
uses: ./../action/.github/check-sarif
with:
sarif-file: ${{ inputs.sarif-file }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/query-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
with:
version: latest

- name: Check Sarif for default queries with Single include, Single exclude
- name: Check SARIF for default queries with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand All @@ -36,7 +36,7 @@ jobs:
config-file: ./.github/codeql/codeql-config-query-filters1.yml
tools: ${{ steps.prepare-test.outputs.tools-url }}

- name: Check Sarif for query packs with Single include, Single exclude
- name: Check SARIF for query packs with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand All @@ -45,7 +45,7 @@ jobs:
config-file: ./.github/codeql/codeql-config-query-filters2.yml
tools: ${{ steps.prepare-test.outputs.tools-url }}

- name: Check Sarif for query packs and local queries with Single include, Single exclude
- name: Check SARIF for query packs and local queries with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## [UNRELEASED]

- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file.[#1098](https://github.com/github/codeql-action/pull/1098)
- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file. [#1098](https://github.com/github/codeql-action/pull/1098)

## 2.1.12 - 01 Jun 2022

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: "CodeQL config 1"
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

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL config 2"
name: "Check SARIF for query packs with Single include, Single exclude"

disable-default-queries: true

Expand All @@ -12,7 +12,7 @@ query-filters:
- include:
tags contain: external/cwe/cwe-022

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL config 3"
name: "Check SARIF for query packs and local queries with Single include, Single exclude"

disable-default-queries: true

Expand All @@ -22,7 +22,7 @@ query-filters:
- include:
tags contain: external/cwe/cwe-022

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy