Skip to content

Commit 4a21a85

Browse files
authored
Merge branch 'main' into threat-models
2 parents e11bfc2 + e48e18a commit 4a21a85

File tree

6,529 files changed

+233626
-131999
lines changed

Some content is hidden

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

6,529 files changed

+233626
-131999
lines changed

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ common --registry=file:///%workspace%/misc/bazel/registry
2424
common --registry=https://bcr.bazel.build
2525

2626
common --@rules_dotnet//dotnet/settings:strict_deps=false
27+
common --experimental_isolated_extension_usages
2728

2829
try-import %workspace%/local.bazelrc

.bazelrc.internal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ common --registry=https://bcr.bazel.build
88
# its implementation packages without providing any code itself.
99
# We either can depend on internal implementation details, or turn of strict deps.
1010
common --@rules_dotnet//dotnet/settings:strict_deps=false
11+
common --experimental_isolated_extension_usages

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.1
1+
5f5d70b6c4d2fb1a889479569107f1692239e8a7

.github/labeler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ Ruby:
3030
- ruby/**/*
3131
- change-notes/**/*ruby*
3232

33+
Rust:
34+
- rust/**/*
35+
- change-notes/**/*rust*
36+
3337
Swift:
3438
- swift/**/*
3539
- change-notes/**/*swift*

.github/pull_request_template.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### Pull Request checklist
2+
3+
#### All query authors
4+
5+
- [ ] A change note is added if necessary. See [the documentation](https://github.com/github/codeql/blob/main/docs/change-notes.md) in this repository.
6+
- [ ] All new queries have appropriate `.qhelp`. See [the documentation](https://github.com/github/codeql/blob/main/docs/query-help-style-guide.md) in this repository.
7+
- [ ] QL tests are added if necessary. See [Testing custom queries](https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/testing-custom-queries) in the GitHub documentation.
8+
- [ ] New and changed queries have correct query metadata. See [the documentation](https://github.com/github/codeql/blob/main/docs/query-metadata-style-guide.md) in this repository.
9+
10+
#### Internal query authors only
11+
12+
- [ ] Autofixes generated based on these changes are valid, only needed if this PR makes significant changes to `.ql`, `.qll`, or `.qhelp` files. See [the documentation](https://github.com/github/codeql-team/blob/main/docs/best-practices/validating-autofix-for-query-changes.md) (internal access required).
13+
- [ ] Changes are validated [at scale](https://github.com/github/codeql-dca/) (internal access required).
14+
- [ ] Adding a new query? Consider also [adding the query to autofix](https://github.com/github/codeml-autofix/blob/main/docs/updating-query-support.md#adding-a-new-query-to-the-query-suite).

.github/workflows/buildifier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
extra_args: >
2525
buildifier --all-files 2>&1 ||
2626
(
27-
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel:buildifier"; exit 1
27+
echo -e "In order to format all bazel files, please run:\n bazel run //misc/bazel/buildifier"; exit 1
2828
)

.github/workflows/check-change-note.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ on:
1616
- "shared/**/*.qll"
1717
- "!**/experimental/**"
1818
- "!ql/**"
19+
- "!rust/**"
1920
- ".github/workflows/check-change-note.yml"
2021

2122
jobs:
2223
check-change-note:
23-
env:
24+
env:
2425
REPO: ${{ github.repository }}
2526
PULL_REQUEST_NUMBER: ${{ github.event.number }}
2627
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -33,7 +34,7 @@ jobs:
3334
!contains(github.event.pull_request.labels.*.name, 'no-change-note-required')
3435
run: |
3536
change_note_files=$(gh api "repos/$REPO/pulls/$PULL_REQUEST_NUMBER/files" --paginate --jq '.[].filename | select(test("/change-notes/.*[.]md$"))')
36-
37+
3738
if [ -z "$change_note_files" ]; then
3839
echo "No change note found. Either add one, or add the 'no-change-note-required' label."
3940
exit 1

.github/workflows/cpp-swift-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
languages: cpp
3939
config-file: ./.github/codeql/codeql-config.yml
40-
40+
4141
- name: "[Ubuntu] Remove GCC 13 from runner image"
4242
shell: bash
4343
run: |
@@ -48,7 +48,7 @@ jobs:
4848
- name: "Build Swift extractor using Bazel"
4949
run: |
5050
bazel clean --expunge
51-
bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local --features=-layering_check
51+
bazel run //swift:create-extractor-pack --nouse_action_cache --noremote_accept_cached --noremote_upload_local_results --spawn_strategy=local
5252
bazel shutdown
5353
5454
- name: Perform CodeQL Analysis

.github/workflows/csharp-qltest.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,6 @@ permissions:
2929
contents: read
3030

3131
jobs:
32-
qlupgrade:
33-
runs-on: ubuntu-latest
34-
steps:
35-
- uses: actions/checkout@v4
36-
- uses: ./.github/actions/fetch-codeql
37-
- name: Check DB upgrade scripts
38-
run: |
39-
echo >empty.trap
40-
codeql dataset import -S ql/lib/upgrades/initial/semmlecode.csharp.dbscheme testdb empty.trap
41-
codeql dataset upgrade testdb --additional-packs ql/lib
42-
diff -q testdb/semmlecode.csharp.dbscheme ql/lib/semmlecode.csharp.dbscheme
43-
- name: Check DB downgrade scripts
44-
run: |
45-
echo >empty.trap
46-
rm -rf testdb; codeql dataset import -S ql/lib/semmlecode.csharp.dbscheme testdb empty.trap
47-
codeql resolve upgrades --format=lines --allow-downgrades --additional-packs downgrades \
48-
--dbscheme=ql/lib/semmlecode.csharp.dbscheme --target-dbscheme=downgrades/initial/semmlecode.csharp.dbscheme |
49-
xargs codeql execute upgrades testdb
50-
diff -q testdb/semmlecode.csharp.dbscheme downgrades/initial/semmlecode.csharp.dbscheme
51-
qltest:
52-
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-latest-xl
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
slice: ["1/2", "2/2"]
58-
steps:
59-
- uses: actions/checkout@v4
60-
- uses: ./csharp/actions/create-extractor-pack
61-
- name: Cache compilation cache
62-
id: query-cache
63-
uses: ./.github/actions/cache-query-compilation
64-
with:
65-
key: csharp-qltest-${{ matrix.slice }}
66-
- name: Run QL tests
67-
run: |
68-
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
69-
env:
70-
GITHUB_TOKEN: ${{ github.token }}
7132
unit-tests:
7233
strategy:
7334
matrix:

.github/workflows/go-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
paths:
55
- "go/**"
6+
- "shared/**"
67
- .github/workflows/go-tests.yml
78
- .github/actions/**
89
- codeql-workspace.yml
@@ -12,6 +13,7 @@ on:
1213
pull_request:
1314
paths:
1415
- "go/**"
16+
- "shared/**"
1517
- .github/workflows/go-tests.yml
1618
- .github/actions/**
1719
- codeql-workspace.yml

0 commit comments

Comments
 (0)