From 81f626a894c51ea5ff90225e5b73dfd699559dc8 Mon Sep 17 00:00:00 2001 From: Asger F Date: Fri, 14 Aug 2026 09:37:07 +0200 Subject: [PATCH 1/2] unified: Build a placeholder executable on windows This mirrors the approach taken by the original Swift extractor --- unified/BUILD.bazel | 7 ++++--- unified/extractor-unsupported-os/BUILD.bazel | 8 ++++++++ unified/extractor-unsupported-os/Cargo.toml | 6 ++++++ unified/extractor-unsupported-os/src/main.rs | 4 ++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 unified/extractor-unsupported-os/BUILD.bazel create mode 100644 unified/extractor-unsupported-os/Cargo.toml create mode 100644 unified/extractor-unsupported-os/src/main.rs diff --git a/unified/BUILD.bazel b/unified/BUILD.bazel index 1539c7fd2f9d..c30dbbdeee58 100644 --- a/unified/BUILD.bazel +++ b/unified/BUILD.bazel @@ -41,9 +41,10 @@ codeql_pkg_files( codeql_pkg_files( name = "extractor-arch", - exes = [ - "//unified/extractor", - ] + select_os( + exes = select_os( + posix = ["//unified/extractor"], + windows = ["//unified/extractor-unsupported-os:extractor"], + ) + select_os( linux = ["//unified/swift-syntax-rs:swift_runtime_libs"], otherwise = [], ), diff --git a/unified/extractor-unsupported-os/BUILD.bazel b/unified/extractor-unsupported-os/BUILD.bazel new file mode 100644 index 000000000000..63ccae37bf45 --- /dev/null +++ b/unified/extractor-unsupported-os/BUILD.bazel @@ -0,0 +1,8 @@ +load("//misc/bazel:rust.bzl", "codeql_rust_binary") + +codeql_rust_binary( + name = "extractor", + srcs = ["src/main.rs"], + crate_root = "src/main.rs", + visibility = ["//visibility:public"], +) diff --git a/unified/extractor-unsupported-os/Cargo.toml b/unified/extractor-unsupported-os/Cargo.toml new file mode 100644 index 000000000000..da374ad31c6f --- /dev/null +++ b/unified/extractor-unsupported-os/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "codeql-extractor-unified-unsupported-os" +description = "Fallback executable for unsupported CodeQL Unified extractor platforms" +version = "0.1.0" +authors = ["GitHub"] +edition = "2024" diff --git a/unified/extractor-unsupported-os/src/main.rs b/unified/extractor-unsupported-os/src/main.rs new file mode 100644 index 000000000000..fa3705a9a68e --- /dev/null +++ b/unified/extractor-unsupported-os/src/main.rs @@ -0,0 +1,4 @@ +fn main() { + println!("Unsupported OS. Extraction is not currently supported on Windows."); + std::process::exit(1); +} From 508df7e7c6dca481de57146012ef4686b0246475 Mon Sep 17 00:00:00 2001 From: Asger F Date: Fri, 14 Aug 2026 13:38:14 +0200 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- unified/extractor-unsupported-os/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unified/extractor-unsupported-os/src/main.rs b/unified/extractor-unsupported-os/src/main.rs index fa3705a9a68e..a59217a2c09d 100644 --- a/unified/extractor-unsupported-os/src/main.rs +++ b/unified/extractor-unsupported-os/src/main.rs @@ -1,4 +1,4 @@ fn main() { - println!("Unsupported OS. Extraction is not currently supported on Windows."); + eprintln!("Unsupported OS. Extraction is not currently supported on Windows."); std::process::exit(1); }