Skip to content

Commit a26da74

Browse files
chanel-ychanel-y
committed
resolved merge conflicts, accepting incoming change
2 parents 5087c8d + e5fa4a6 commit a26da74

File tree

1,324 files changed

+89872
-34551
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,324 files changed

+89872
-34551
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.github/instructions/expected-files.instructions.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
applyTo: "**/*.expected"
3+
---
4+
Ignore these files. These are generated to be correct by running the tests, and should not be edited manually.

‎.github/instructions/ql-files.instructions.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
applyTo: "**/*.ql,**/*.qll"
3+
---
4+
When reviewing these QL files, do not make any comment on the code itself. You don't understand the QL programming language well enough yet. You can only make comments about the following aspects:
5+
* comments (lines starting with `//` or block comments enclosed in `/* ... */`): you can suggest improvements to the clarity of comments, or point out spelling mistakes
6+
* typos in identifiers

‎Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ members = [
1010
"rust/ast-generator",
1111
"rust/autobuild",
1212
]
13-
exclude = ["mad-generation-build"]

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ bazel_dep(name = "rules_go", version = "0.56.1")
1919
bazel_dep(name = "rules_pkg", version = "1.0.1")
2020
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
2121
bazel_dep(name = "rules_python", version = "0.40.0")
22-
bazel_dep(name = "rules_shell", version = "0.3.0")
23-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
22+
bazel_dep(name = "rules_shell", version = "0.5.0")
23+
bazel_dep(name = "bazel_skylib", version = "1.8.1")
2424
bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
2525
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")
2929
bazel_dep(name = "rules_dotnet", version = "0.19.2-codeql.1")
3030
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
31-
bazel_dep(name = "rules_rust", version = "0.63.0")
31+
bazel_dep(name = "rules_rust", version = "0.66.0")
3232
bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
3333

3434
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)

‎actions/ql/lib/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.20
2+
3+
No user-facing changes.
4+
15
## 0.4.19
26

37
No user-facing changes.

‎actions/ql/lib/change-notes/released/0.4.20.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.4.20
2+
3+
No user-facing changes.

‎actions/ql/lib/codeql-pack.release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.4.19
2+
lastReleaseVersion: 0.4.20

‎actions/ql/lib/codeql/actions/security/ArgumentInjectionQuery.qll‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ private module ArgumentInjectionConfig implements DataFlow::ConfigSig {
100100

101101
predicate observeDiffInformedIncrementalMode() { any() }
102102

103-
Location getASelectedSourceLocation(DataFlow::Node source) { none() }
104-
105103
Location getASelectedSinkLocation(DataFlow::Node sink) {
106104
result = sink.getLocation()
107105
or

‎actions/ql/lib/codeql/actions/security/ArtifactPoisoningQuery.qll‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ private module ArtifactPoisoningConfig implements DataFlow::ConfigSig {
333333

334334
predicate observeDiffInformedIncrementalMode() { any() }
335335

336-
Location getASelectedSourceLocation(DataFlow::Node source) { none() }
337-
338336
Location getASelectedSinkLocation(DataFlow::Node sink) {
339337
result = sink.getLocation()
340338
or

0 commit comments

Comments
 (0)