Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable bindgen tests for windows #3085

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -909,20 +909,18 @@ tasks:
- "//..."
test_targets:
- "//..."
# # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
# # The bindgen rules are currently broken on windows
# extensions_bindgen_windows:
# platform: windows
# name: Extensions Bindgen
# working_directory: extensions/bindgen
# build_flags: *aspects_flags
# test_flags: *aspects_flags
# build_targets:
# - "--"
# - "//..."
# test_targets:
# - "--"
# - "//..."
extensions_bindgen_windows:
platform: windows
name: Extensions Bindgen
working_directory: extensions/bindgen
build_flags: *aspects_flags
test_flags: *aspects_flags
build_targets:
- "--"
- "//..."
test_targets:
- "--"
- "//..."
extensions_prost_linux:
platform: ubuntu2004
name: Extensions Prost
Expand Down
3 changes: 1 addition & 2 deletions .bcr/extensions/bindgen/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ bcr_test_module:
platform:
- "macos_arm64"
- "ubuntu2004"
# # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
# - "windows"
- "windows"
bazel: ["7.x"]
tasks:
run_tests:
Expand Down
7 changes: 5 additions & 2 deletions extensions/bindgen/private/bindgen.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def _get_user_link_flags(cc_lib):
return linker_flags

def _generate_cc_link_build_info(ctx, cc_lib):
"""Produce the eqivilant cargo_build_script providers for use in linking the library.
"""Produce the equivalent cargo_build_script providers for use in linking the library.

Args:
ctx (ctx): The rule's context object
Expand Down Expand Up @@ -391,7 +391,10 @@ rust_bindgen = rule(
default = True,
),
"wrap_static_fns": attr.bool(
doc = "Whether to create a separate .c file for static fns. Requires nightly toolchain, and a header that actually needs this feature (otherwise bindgen won't generate the file and Bazel complains).",
doc = (
"Whether to create a separate .c file for static functions. Requires nightly toolchain, " +
"and a header that actually needs this feature (otherwise bindgen won't generate the file and Bazel complains)."
),
default = False,
),
"_cc_toolchain": attr.label(
Expand Down
Loading