Skip to content

Commit 4fd7aec

Browse files
author
Dilan
committed
Merge tag 'codeql-cli/latest'
Compatible with the latest released version of the CodeQL CLI
2 parents faa5554 + d427888 commit 4fd7aec

File tree

3,344 files changed

+119638
-28306
lines changed

Some content is hidden

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

3,344 files changed

+119638
-28306
lines changed

.bazelrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,12 @@ common --registry=https://bcr.bazel.build
2424

2525
common --@rules_dotnet//dotnet/settings:strict_deps=false
2626

27+
# Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
28+
common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
29+
30+
build --java_language_version=17
31+
build --tool_java_language_version=17
32+
build --tool_java_runtime_version=remotejdk_17
33+
build --java_runtime_version=remotejdk_17
34+
2735
try-import %workspace%/local.bazelrc

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0rc1
1+
8.0.0

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@
8686
/misc/ripunzip/ripunzip-* filter=lfs diff=lfs merge=lfs -text
8787

8888
# swift prebuilt resources
89-
/swift/third_party/resource-dir/*.zip filter=lfs diff=lfs merge=lfs -text
89+
/swift/third_party/resources/*.zip filter=lfs diff=lfs merge=lfs -text
90+
/swift/third_party/resources/*.tar.zst filter=lfs diff=lfs merge=lfs -text

.github/codeql/codeql-config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ paths-ignore:
99
- '/python/'
1010
- '/javascript/ql/test'
1111
- '/javascript/extractor/tests'
12-
- '/rust/ql/test'
13-
- '/rust/ql/integration-tests'
12+
- '/rust/ql'

.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/cpp-swift-analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
CodeQL-Build:
2121

22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
2323

2424
permissions:
2525
contents: read
@@ -38,12 +38,10 @@ jobs:
3838
languages: cpp
3939
config-file: ./.github/codeql/codeql-config.yml
4040

41-
- name: "[Ubuntu] Remove GCC 13 from runner image"
42-
shell: bash
41+
- name: Install dependencies
4342
run: |
44-
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
4543
sudo apt-get update
46-
sudo apt-get install -y --allow-downgrades libc6=2.35-* libc6-dev=2.35-* libstdc++6=12.3.0-* libgcc-s1=12.3.0-*
44+
sudo apt-get install -y uuid-dev
4745
4846
- name: "Build Swift extractor using Bazel"
4947
run: |

.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/swift.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,10 @@ jobs:
5050
- uses: ./swift/actions/build-and-test
5151
build-and-test-linux:
5252
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-latest-xl
53+
runs-on: ubuntu-22.04
5454
steps:
5555
- uses: actions/checkout@v4
5656
- uses: ./swift/actions/build-and-test
57-
qltests-linux:
58-
if: github.repository_owner == 'github'
59-
needs: build-and-test-linux
60-
runs-on: ubuntu-latest-xl
61-
steps:
62-
- uses: actions/checkout@v4
63-
- uses: ./swift/actions/run-ql-tests
6457
qltests-macos:
6558
if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
6659
needs: build-and-test-macos
@@ -109,3 +102,10 @@ jobs:
109102
- uses: actions/checkout@v4
110103
- uses: ./.github/actions/fetch-codeql
111104
- uses: ./swift/actions/database-upgrade-scripts
105+
check-no-override:
106+
if : github.event_name == 'pull_request'
107+
runs-on: ubuntu-latest
108+
steps:
109+
- uses: actions/checkout@v4
110+
- shell: bash
111+
run: bazel test //swift/... --test_tag_filters=override --test_output=errors

0 commit comments

Comments
 (0)