Skip to content

Commit d1a2c0f

Browse files
redsun82redsun82
committed
Merge branch 'main' into redsun82/kotlin
2 parents 821bd1f + e6dc36b commit d1a2c0f

File tree

623 files changed

+16972
-9140
lines changed

Some content is hidden

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

623 files changed

+16972
-9140
lines changed

‎.bazelrc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
1010

1111
build --repo_env=CC=clang --repo_env=CXX=clang++
1212

13-
build:linux --cxxopt=-std=c++20
14-
# we currently cannot built the swift extractor for ARM
15-
build:macos --cxxopt=-std=c++20 --copt=-arch --copt=x86_64 --linkopt=-arch --linkopt=x86_64
16-
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor
13+
# we use transitions that break builds of `...`, so for `test` to work with that we need the following
14+
test --build_tests_only
1715

1816
# this requires developer mode, but is required to have pack installer functioning
1917
startup --windows_enable_symlinks
2018
common --enable_runfiles
2119

20+
# with the above, we can avoid building python zips which is the default on windows as that's expensive
21+
build --nobuild_python_zip
22+
2223
common --registry=file:///%workspace%/misc/bazel/registry
2324
common --registry=https://bcr.bazel.build
2425

‎.gitattributes‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,9 @@
8181
/csharp/.paket/Paket.Restore.targets linguist-generated=true eol=crlf
8282
/csharp/paket.main.bzl linguist-generated=true
8383
/csharp/paket.main_extension.bzl linguist-generated=true
84+
85+
# ripunzip tool
86+
/misc/bazel/internal/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
87+
88+
# swift prebuilt resources
89+
/swift/third_party/resource-dir/*.zip filter=lfs diff=lfs merge=lfs -text

‎.github/workflows/csharp-qltest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
key: csharp-qltest-${{ matrix.slice }}
6666
- name: Run QL tests
6767
run: |
68-
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path extractor-pack --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 }}"
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 }}"
6969
env:
7070
GITHUB_TOKEN: ${{ github.token }}
7171
unit-tests:
@@ -101,6 +101,6 @@ jobs:
101101
# Update existing stubs in the repo with the freshly generated ones
102102
mv "$STUBS_PATH/output/stubs/_frameworks" ql/test/resources/stubs/
103103
git status
104-
codeql test run --threads=0 --search-path extractor-pack --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries -- ql/test/library-tests/dataflow/flowsources/aspremote
104+
codeql test run --threads=0 --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries -- ql/test/library-tests/dataflow/flowsources/aspremote
105105
env:
106106
GITHUB_TOKEN: ${{ github.token }}

‎.github/workflows/go-tests-other-os.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
- .github/workflows/go-tests-other-os.yml
88
- .github/actions/**
99
- codeql-workspace.yml
10+
- MODULE.bazel
11+
- .bazelrc
12+
- misc/bazel/**
1013

1114
permissions:
1215
contents: read

‎.github/workflows/go-tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
- .github/workflows/go-tests.yml
1616
- .github/actions/**
1717
- codeql-workspace.yml
18+
- MODULE.bazel
19+
- .bazelrc
20+
- misc/bazel/**
1821

1922
permissions:
2023
contents: read

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,20 @@ jobs:
4949
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-rust-cargo-${{ hashFiles('ql/**/Cargo.lock') }}
5050
- name: Release build
5151
if: steps.cache-extractor.outputs.cache-hit != 'true'
52-
run: cd ql; ./scripts/create-extractor-pack.sh
52+
run: cd ql; ./scripts/create-extractor-pack.sh
5353
env:
54-
GH_TOKEN: ${{ github.token }}
54+
GH_TOKEN: ${{ github.token }}
5555
- name: Cache compilation cache
5656
id: query-cache
5757
uses: ./.github/actions/cache-query-compilation
58-
with:
58+
with:
5959
key: run-ql-for-ql
6060
- name: Make database and analyze
6161
run: |
6262
./ql/target/release/buramu | tee deprecated.blame # Add a blame file for the extractor to parse.
63-
${CODEQL} database create -l=ql --search-path ql/extractor-pack ${DB}
63+
${CODEQL} database create -l=ql ${DB} --search-path "${{ github.workspace }}"
6464
${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 }}"
65-
env:
65+
env:
6666
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
6767
DB: ${{ runner.temp }}/DB
6868
LGTM_INDEX_FILTERS: |

‎.github/workflows/ql-for-ql-dataset_measure.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
- name: Create database
5454
run: |
5555
"${CODEQL}" database create \
56-
--search-path "ql/extractor-pack" \
57-
--threads 4 \
56+
--search-path "${{ github.workspace }}"
57+
--threads 4 \
5858
--language ql --source-root "${{ github.workspace }}/repo" \
5959
"${{ runner.temp }}/database"
6060
env:

‎.github/workflows/ql-for-ql-tests.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ jobs:
4949
- name: Cache compilation cache
5050
id: query-cache
5151
uses: ./.github/actions/cache-query-compilation
52-
with:
52+
with:
5353
key: ql-for-ql-tests
5454
- name: Run QL tests
5555
run: |
56-
"${CODEQL}" test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}/ql/extractor-pack" --consistency-queries ql/ql/consistency-queries --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" ql/ql/test
56+
"${CODEQL}" test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path "${{ github.workspace }}" --consistency-queries ql/ql/consistency-queries --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" ql/ql/test
5757
env:
5858
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
5959

60-
other-os:
60+
other-os:
6161
strategy:
6262
matrix:
6363
os: [macos-latest, windows-latest]
6464
needs: [qltest]
6565
runs-on: ${{ matrix.os }}
6666
steps:
6767
- uses: actions/checkout@v4
68-
- name: Install GNU tar
68+
- name: Install GNU tar
6969
if: runner.os == 'macOS'
7070
run: |
7171
brew install gnu-tar
@@ -100,13 +100,12 @@ jobs:
100100
- name: Run a single QL tests - Unix
101101
if: runner.os != 'Windows'
102102
run: |
103-
"${CODEQL}" test run --check-databases --search-path "${{ github.workspace }}/ql/extractor-pack" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
103+
"${CODEQL}" test run --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
104104
env:
105105
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
106106
- name: Run a single QL tests - Windows
107107
if: runner.os == 'Windows'
108108
shell: pwsh
109109
run: |
110110
$Env:PATH += ";$(dirname ${{ steps.find-codeql.outputs.codeql-path }})"
111-
codeql test run --check-databases --search-path "${{ github.workspace }}/ql/extractor-pack" ql/ql/test/queries/style/DeadCode/DeadCode.qlref
112-
111+
codeql test run --check-databases --search-path "${{ github.workspace }}" ql/ql/test/queries/style/DeadCode/DeadCode.qlref

‎.github/workflows/ruby-dataset-measure.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Create database
4545
run: |
4646
codeql database create \
47-
--search-path "${{ github.workspace }}/ruby/extractor-pack" \
47+
--search-path "${{ github.workspace }}" \
4848
--threads 4 \
4949
--language ruby --source-root "${{ github.workspace }}/repo" \
5050
"${{ runner.temp }}/database"

‎.github/workflows/ruby-qltest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ jobs:
6464
- name: Cache compilation cache
6565
id: query-cache
6666
uses: ./.github/actions/cache-query-compilation
67-
with:
67+
with:
6868
key: ruby-qltest
6969
- name: Run QL tests
7070
run: |
71-
codeql test run --threads=0 --ram 50000 --search-path "${{ github.workspace }}/ruby/extractor-pack" --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
71+
codeql test run --threads=0 --ram 50000 --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
7272
env:
7373
GITHUB_TOKEN: ${{ github.token }}

0 commit comments

Comments
 (0)