Skip to content
Open
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
14 changes: 7 additions & 7 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -684,19 +684,19 @@ tasks:
test_targets:
- "//..."

# --- using_cxx (linux + macos only, C++ codegen platform issues) ---
cu_integ_using_cxx_ubuntu2204:
name: Crate Universe - using_cxx
# --- external_annotations (linux + macos only, C++ codegen platform issues) ---
cu_integ_ext_annotations_ubuntu2204:
name: Crate Universe - external_annotations
platform: ubuntu2204
working_directory: crate_universe/tests/integration/using_cxx
working_directory: crate_universe/tests/integration/ext_annotations
build_targets:
- "//..."
test_targets:
- "//..."
cu_integ_using_cxx_macos:
name: Crate Universe - using_cxx
cu_integ_ext_annotations_macos:
name: Crate Universe - external_annotations
platform: macos_arm64
working_directory: crate_universe/tests/integration/using_cxx
working_directory: crate_universe/tests/integration/ext_annotations
build_targets:
- "//..."
test_targets:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rust_binary(
deps = [
":blobstore-sys",
":bridge",
"@using_cxx//:cxx",
"@ext_annotations//:cxx",
],
)

Expand All @@ -34,7 +34,7 @@ cc_library(
name = "blobstore-include",
hdrs = ["include/blobstore.h"],
copts = ["-std=c++17"],
deps = ["@using_cxx//:cxx_cc"],
deps = ["@ext_annotations//:cxx_cc"],
)

rust_test(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module(
name = "cu_test_using_cxx",
name = "cu_test_external_annotations",
version = "0.0.0",
)

Expand All @@ -19,24 +19,24 @@ register_toolchains("@rust_toolchains//:all")

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

using_cxx = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
using_cxx.spec(
ext_annotations = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
ext_annotations.spec(
package = "cxx",
repositories = ["using_cxx"],
repositories = ["ext_annotations"],
version = "1.0.194",
)
using_cxx.splicing_config(
repositories = ["using_cxx"],
ext_annotations.splicing_config(
repositories = ["ext_annotations"],
resolver_version = "2",
)
using_cxx.from_specs(
name = "using_cxx",
ext_annotations.from_specs(
name = "ext_annotations",
cargo_lockfile = "//:Cargo.Bazel.lock",
lockfile = "//:cargo-bazel-lock.json",
)
use_repo(
using_cxx,
"using_cxx",
ext_annotations,
"ext_annotations",
)

http_archive(
Expand Down

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

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "c5a140bbdaef02d845d7bdcf5dddec8f4bf226a633df2cc387505a9ecbbbe12e",
"checksum": "d0fc74ea5fdb97c4b30b32c3912956275741e263efd34056282cb274cb86bbcb",
"crates": {
"anstyle 1.0.1": {
"name": "anstyle",
Expand Down
Loading