Skip to content

Commit 879eff4

Browse files
authored
Merge branch 'main' into util/inline-expect-test-use-end-line
2 parents 59efcd5 + efc75e0 commit 879eff4

File tree

171 files changed

+24149
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+24149
-215
lines changed

.github/workflows/compile-queries.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
with:
2525
key: all-queries
2626
- name: check formatting
27-
run: find */ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 codeql query format --check-only
27+
run: find */ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 -n 3000 -P 10 codeql query format -q --check-only
2828
- name: compile queries - check-only
2929
# run with --check-only if running in a PR (github.sha != main)
3030
if : ${{ github.event_name == 'pull_request' }}
3131
shell: bash
32-
run: codeql query compile -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
32+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
3333
- name: compile queries - full
3434
# do full compile if running on main - this populates the cache
3535
if : ${{ github.event_name != 'pull_request' }}
3636
shell: bash
37-
run: codeql query compile -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
37+
run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"

.github/workflows/ql-for-ql-build.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
steps:
1616
### Build the queries ###
1717
- uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 0
1820
- name: Find codeql
1921
id: find-codeql
2022
uses: github/codeql-action/init@v2
@@ -27,7 +29,9 @@ jobs:
2729
id: cache-extractor
2830
uses: actions/cache@v3
2931
with:
30-
path: ql/extractor-pack/
32+
path: |
33+
ql/extractor-pack/
34+
ql/target/release/buramu
3135
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-extractor-${{ hashFiles('ql/**/Cargo.lock') }}-${{ hashFiles('ql/**/*.rs') }}
3236
- name: Cache cargo
3337
if: steps.cache-extractor.outputs.cache-hit != 'true'
@@ -50,6 +54,7 @@ jobs:
5054
key: run-ql-for-ql
5155
- name: Make database and analyze
5256
run: |
57+
./ql/target/release/buramu | tee deprecated.blame # Add a blame file for the extractor to parse.
5358
${CODEQL} database create -l=ql --search-path ql/extractor-pack ${DB}
5459
${CODEQL} database analyze -j0 --format=sarif-latest --output=ql-for-ql.sarif ${DB} ql/ql/src/codeql-suites/ql-code-scanning.qls --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
5560
env:
@@ -58,6 +63,7 @@ jobs:
5863
LGTM_INDEX_FILTERS: |
5964
exclude:ql/ql/test
6065
exclude:*/ql/lib/upgrades/
66+
exclude:java/ql/integration-tests
6167
- name: Upload sarif to code-scanning
6268
uses: github/codeql-action/upload-sarif@v2
6369
with:

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
/csharp/ @github/codeql-csharp
33
/go/ @github/codeql-go
44
/java/ @github/codeql-java
5-
/javascript/ @github/codeql-javascript
6-
/python/ @github/codeql-python
7-
/ruby/ @github/codeql-ruby
5+
/javascript/ @github/codeql-dynamic
6+
/python/ @github/codeql-dynamic
7+
/ruby/ @github/codeql-dynamic
88
/swift/ @github/codeql-swift
99
/java/kotlin-extractor/ @github/codeql-kotlin
1010
/java/kotlin-explorer/ @github/codeql-kotlin

cpp/ql/lib/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Lines changed: 3 additions & 0 deletions

cpp/ql/lib/codeql-pack.release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.5.2
2+
lastReleaseVersion: 0.5.3

cpp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-all
2-
version: 0.5.3-dev
2+
version: 0.5.4-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/src/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Lines changed: 3 additions & 0 deletions

cpp/ql/src/codeql-pack.release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.5.2
2+
lastReleaseVersion: 0.5.3

0 commit comments

Comments
 (0)