Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ build --define=CODEQL_PLATFORM={CODEQL_PLATFORM}
common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub

build --repo_env=CC=clang --repo_env=CXX=clang++
# The standalone Linux toolchain uses gold, which does not support the
# LLD-specific -z nostart-stop-gc workaround enabled by rules_swift.
build:linux --features=-swift.lld_gc_workaround
# Disable Android SDK auto-detection (we don't use it, and rules_android has Bazel 9 compatibility issues)
build --repo_env=ANDROID_HOME=

Expand Down
5 changes: 2 additions & 3 deletions .github/skills/bazel/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ Bazel's own macro / rule / repository-rule distinction applies as usual. What is

Prefer inline rules in `BUILD.bazel`. A `.bzl` file earns its `load()` only when the shape repeats across packages or a
value must be computed: [`rust.bzl`](../../../misc/bazel/rust.bzl) is worth it because every Rust binary that ships in a
pack must get the same universal-binary wrapper and symbols test, and forgetting either is a release bug. A local
debugging aid opts out and declares a plain `rust_binary`; see `swift-syntax-parse` in
[`unified/swift-syntax-rs/BUILD.bazel`](../../../unified/swift-syntax-rs/BUILD.bazel). The `_gen_binaries` list in
pack must get the same universal-binary wrapper and symbols test, and forgetting either is a release bug. The
`_gen_binaries` list in
[`go/BUILD.bazel`](../../../go/BUILD.bazel) does not earn a `.bzl`, because it is shared within a single file, where a
local variable does the job.

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-rust-analyzer.lock.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .github/workflows/update-rust-analyzer.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ safe-outputs:
- "shared/yeast-schema/Cargo.toml"
- "ruby/extractor/Cargo.toml"
- "unified/extractor/Cargo.toml"
- "unified/swift-syntax-rs/Cargo.toml"
- "unified/extractor-unsupported-os/Cargo.toml"
- "cpp/extractor/bmn/**"
- "ql/extractor/**"
Expand Down
8 changes: 0 additions & 8 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,3 @@ exports_files([
"Cargo.lock",
"Cargo.toml",
])

constraint_setting(name = "swift_runtime_linkage")

constraint_value(
name = "static_swift_runtime",
constraint_setting = ":swift_runtime_linkage",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/swift/ @github/codeql-swift
/swift/extractor/ @github/codeql-swift @github/code-scanning-language-coverage
/unified/extractor/ @github/code-scanning-language-coverage
/unified/swift-syntax-rs/ @github/code-scanning-language-coverage
/unified/swift-parser/ @github/code-scanning-language-coverage
/misc/codegen/ @github/codeql-swift
/java/kotlin-extractor/ @github/codeql-kotlin @github/code-scanning-language-coverage
/java/ql/test-kotlin1/ @github/codeql-kotlin
Expand Down
16 changes: 12 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ members = [
"shared/yeast-schema",
"ruby/extractor",
"unified/extractor",
"unified/swift-syntax-rs",
"unified/swift-parser",
"rust/extractor",
"rust/extractor/macros",
"rust/ast-generator",
Expand Down
31 changes: 0 additions & 31 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ bazel_dep(name = "gazelle", version = "0.54.0")
bazel_dep(name = "rules_dotnet", version = "0.22.2-codeql.1")
bazel_dep(name = "googletest", version = "1.18.0.bcr.1")
bazel_dep(name = "rules_rust", version = "0.75.0")
bazel_dep(name = "rules_swift", version = "4.2.2-codeql.1")
bazel_dep(name = "swift-syntax", version = "604.0.0")
bazel_dep(name = "zstd", version = "1.5.7.bcr.3")

bazel_dep(name = "buildifier_prebuilt", version = "10.1.0", dev_dependency = True)
Expand Down Expand Up @@ -258,35 +256,6 @@ use_repo(
"swift-resource-dir-macos",
)

# Hermetic swift.org toolchain for building `unified/swift-syntax-rs`.
#
# The version is pinned as a literal rather than read from
# `unified/swift-syntax-rs/.swift-version` via `swift_version_file`: the latter
# makes the extension `module_ctx.read` a `//unified/...` label, which fails to
# resolve when this repo is consumed as a dependency module (`@@ql+`) whose
# `unified/swift-syntax-rs` package is not loadable in that context. Keep this
# in sync with `unified/swift-syntax-rs/.swift-version` (used by the `cargo`
# build) and the `swift-syntax` release in `swift/Package.swift`.
swift = use_extension("@rules_swift//swift:extensions.bzl", "swift", dev_dependency = True)
swift.toolchain(
name = "swift_toolchain",
swift_version = "6.3.3",
)
use_repo(
swift,
"swift_toolchain",
"swift_toolchain_ubuntu22.04",
"swift_toolchain_ubuntu22.04-aarch64",
"swift_toolchain_xcode",
)

register_toolchains(
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04",
"@swift_toolchain//:swift_toolchain_exec_ubuntu22.04-aarch64",
"@swift_toolchain//:swift_toolchain_exec_xcode",
dev_dependency = True,
)

node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
node.toolchain(
name = "nodejs",
Expand Down
Loading
Loading