Skip to content

Commit 014ce93

Browse files
authored
Merge branch 'main' into js/dynamodb
2 parents 3be5832 + 7670a2b commit 014ce93

File tree

539 files changed

+22002
-7242
lines changed

Some content is hidden

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

539 files changed

+22002
-7242
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Setup dotnet
3535
uses: actions/setup-dotnet@v4
3636
with:
37-
dotnet-version: 9.0.100
37+
dotnet-version: 9.0.300
3838

3939
- name: Checkout repository
4040
uses: actions/checkout@v5

.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ jobs:
4343
- name: Setup dotnet
4444
uses: actions/setup-dotnet@v4
4545
with:
46-
dotnet-version: 9.0.100
46+
dotnet-version: 9.0.300
4747
- name: Extractor unit tests
4848
run: |
4949
dotnet tool restore
50-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Util.Tests
51-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 extractor/Semmle.Extraction.Tests
52-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.CSharp.Tests
53-
dotnet test -p:RuntimeFrameworkVersion=9.0.0 autobuilder/Semmle.Autobuild.Cpp.Tests
50+
dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Util.Tests
51+
dotnet test -p:RuntimeFrameworkVersion=9.0.5 extractor/Semmle.Extraction.Tests
52+
dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.CSharp.Tests
53+
dotnet test -p:RuntimeFrameworkVersion=9.0.5 autobuilder/Semmle.Autobuild.Cpp.Tests
5454
shell: bash
5555
stubgentest:
5656
runs-on: ubuntu-latest

.github/workflows/query-list.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
python-version: 3.8
3333
- name: Download CodeQL CLI
34-
# Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo
34+
# Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo
3535
uses: ./codeql/.github/actions/fetch-codeql
3636
- name: Build code scanning query list
3737
run: |

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
2626
bazel_dep(name = "fmt", version = "10.0.0")
2727
bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.1")
2828
bazel_dep(name = "gazelle", version = "0.40.0")
29-
bazel_dep(name = "rules_dotnet", version = "0.17.4")
29+
bazel_dep(name = "rules_dotnet", version = "0.19.2-codeql.1")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
3131
bazel_dep(name = "rules_rust", version = "0.63.0")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
@@ -172,7 +172,7 @@ http_archive(
172172
)
173173

174174
dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
175-
dotnet.toolchain(dotnet_version = "9.0.100")
175+
dotnet.toolchain(dotnet_version = "9.0.300")
176176
use_repo(dotnet, "dotnet_toolchains")
177177

178178
register_toolchains("@dotnet_toolchains//:all")

actions/extractor/codeql-extractor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
name: "actions"
2-
aliases: []
32
display_name: "GitHub Actions"
43
version: 0.0.1
54
column_kind: "utf16"
@@ -8,9 +7,11 @@ build_modes:
87
- none
98
default_queries:
109
- codeql/actions-queries
11-
file_coverage_languages: []
10+
# Actions workflows are not reported separately by the GitHub API, so we can't
11+
# associate them with a specific language.
1212
github_api_languages: []
13-
scc_languages: []
13+
scc_languages:
14+
- YAML
1415
file_types:
1516
- name: workflow
1617
display_name: GitHub Actions workflow files
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"paths": [
3+
".github/workflows/*.yml",
4+
".github/workflows/*.yaml",
5+
".github/reusable_workflows/**/*.yml",
6+
".github/reusable_workflows/**/*.yaml",
7+
"**/action.yml",
8+
"**/action.yaml"
9+
]
10+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@echo off
2+
type "%CODEQL_EXTRACTOR_ACTIONS_ROOT%\tools\baseline-config.json"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
cat "$CODEQL_EXTRACTOR_ACTIONS_ROOT/tools/baseline-config.json"

actions/ql/integration-tests/query-suite/actions-code-scanning.qls.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
ql/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
12
ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
23
ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql
34
ql/actions/ql/src/Security/CWE-094/CodeInjectionCritical.ql

actions/ql/integration-tests/query-suite/actions-security-and-quality.qls.expected

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ql/actions/ql/src/Debug/SyntaxError.ql
2+
ql/actions/ql/src/Diagnostics/SuccessfullyExtractedFiles.ql
23
ql/actions/ql/src/Security/CWE-077/EnvPathInjectionCritical.ql
34
ql/actions/ql/src/Security/CWE-077/EnvPathInjectionMedium.ql
45
ql/actions/ql/src/Security/CWE-077/EnvVarInjectionCritical.ql

0 commit comments

Comments
 (0)