Skip to content

Commit 10d8aa4

Browse files
authored
Merge branch 'main' into redsun82/rust-mute-warnings-in-uncompiled-blocks
2 parents 218bc80 + b0062fc commit 10d8aa4

File tree

1,739 files changed

+69719
-11144
lines changed

Some content is hidden

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

1,739 files changed

+69719
-11144
lines changed

.github/workflows/check-qldoc.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ jobs:
3030
run: |
3131
EXIT_CODE=0
3232
# TODO: remove the shared exception from the regex when coverage of qlpacks without dbschemes is supported
33-
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!(shared))[a-z]*/ql/lib' || true; } | sort -u)"
33+
# TODO: remove the actions exception once https://github.com/github/codeql-team/issues/3656 is fixed
34+
changed_lib_packs="$(git diff --name-only --diff-filter=ACMRT HEAD^ HEAD | { grep -Po '^(?!(shared|actions))[a-z]*/ql/lib' || true; } | sort -u)"
3435
for pack_dir in ${changed_lib_packs}; do
3536
lang="${pack_dir%/ql/lib}"
3637
codeql generate library-doc-coverage --output="${RUNNER_TEMP}/${lang}-current.txt" --dir="${pack_dir}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
ql/target
4141
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-qltest-cargo-${{ hashFiles('ql/rust-toolchain.toml', 'ql/**/Cargo.lock') }}
4242
- name: Check formatting
43-
run: cd ql; cargo fmt --all -- --check
43+
run: cd ql; cargo fmt -- --check
4444
- name: Build extractor
4545
run: |
4646
cd ql;

.github/workflows/ruby-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-rust-cargo-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/**/Cargo.lock') }}
8080
- name: Check formatting
8181
if: steps.cache-extractor.outputs.cache-hit != 'true'
82-
run: cd extractor && cargo fmt --all -- --check
82+
run: cd extractor && cargo fmt -- --check
8383
- name: Build
8484
if: steps.cache-extractor.outputs.cache-hit != 'true'
8585
run: cd extractor && cargo build --verbose

.github/workflows/rust.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,48 @@ permissions:
2323
contents: read
2424

2525
jobs:
26-
rust-code:
26+
rust-ast-generator:
2727
runs-on: ubuntu-latest
28+
defaults:
29+
run:
30+
working-directory: rust/ast-generator
2831
steps:
2932
- name: Checkout
3033
uses: actions/checkout@v4
34+
- name: Inject sources
35+
shell: bash
36+
run: |
37+
bazel run //rust/ast-generator:inject-sources
3138
- name: Format
32-
working-directory: rust/extractor
3339
shell: bash
3440
run: |
3541
cargo fmt --check
3642
- name: Compilation
37-
working-directory: rust/extractor
3843
shell: bash
3944
run: cargo check
4045
- name: Clippy
46+
shell: bash
47+
run: |
48+
cargo clippy --no-deps -- -D warnings
49+
rust-code:
50+
runs-on: ubuntu-latest
51+
defaults:
52+
run:
4153
working-directory: rust/extractor
54+
steps:
55+
- name: Checkout
56+
uses: actions/checkout@v4
57+
- name: Format
58+
shell: bash
59+
run: |
60+
cargo fmt --check
61+
- name: Compilation
62+
shell: bash
63+
run: cargo check
64+
- name: Clippy
4265
shell: bash
4366
run: |
44-
cargo clippy --fix
45-
git diff --exit-code
67+
cargo clippy --no-deps -- -D warnings
4668
rust-codegen:
4769
runs-on: ubuntu-latest
4870
steps:

.github/workflows/tree-sitter-extractor-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v4
3434
- name: Check formatting
35-
run: cargo fmt --all -- --check
35+
run: cargo fmt -- --check
3636
- name: Run tests
3737
run: cargo test --verbose
3838
fmt:
39-
runs-on: ubuntu-latest
39+
runs-on: ubuntu-latest
4040
steps:
4141
- uses: actions/checkout@v4
4242
- name: Check formatting
4343
run: cargo fmt --check
4444
clippy:
45-
runs-on: ubuntu-latest
45+
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v4
4848
- name: Run clippy

.vscode/tasks.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"description": "Language",
8282
"options":
8383
[
84+
"actions",
8485
"go",
8586
"java",
8687
"javascript",

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/actions/ @github/codeql-dynamic
12
/cpp/ @github/codeql-c-analysis
23
/csharp/ @github/codeql-csharp
34
/csharp/autobuilder/Semmle.Autobuild.Cpp @github/codeql-c-extractor

0 commit comments

Comments
 (0)