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

Add support for layering_check #246

Merged
merged 13 commits into from
Jan 19, 2024
Prev Previous commit
Next Next commit
Update abseil-cpp further
fmeum committed Jan 16, 2024
commit 212a84c1c5e9468e94065c7ed19451c8421067b6
6 changes: 3 additions & 3 deletions tests/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -31,10 +31,10 @@ bazel_dep(name = "rules_rust", version = "0.27.0")
bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl")
archive_override(
module_name = "abseil-cpp",
integrity = "sha256-4c3q1DMUJmjzz0ldlHdYT0Bv0rZoxTNuJqIguoQt5Vw=",
integrity = "sha256-y4VIbqbtC5jid7maB/QbWfwl9Yu0IZrDWaXGqQipvmk=",
patches = ["//patches:abseil-cpp.patch"],
strip_prefix = "abseil-cpp-0ef3ef432996de4c5afa879b93b2ba4f6c130ab2",
urls = ["https://github.com/abseil/abseil-cpp/archive/0ef3ef432996de4c5afa879b93b2ba4f6c130ab2.tar.gz"],
strip_prefix = "abseil-cpp-b2dd3a5be797f8194bbc230c65f35aadd3998535",
urls = ["https://github.com/abseil/abseil-cpp/archive/b2dd3a5be797f8194bbc230c65f35aadd3998535.tar.gz"],
)

# Temporary override until newer version is released to the central registry.
5 changes: 2 additions & 3 deletions tests/WORKSPACE
Original file line number Diff line number Diff line change
@@ -156,9 +156,8 @@ http_archive(

http_archive(
name = "com_google_absl",
integrity = "sha256-4c3q1DMUJmjzz0ldlHdYT0Bv0rZoxTNuJqIguoQt5Vw=",
strip_prefix = "abseil-cpp-0ef3ef432996de4c5afa879b93b2ba4f6c130ab2",
urls = ["https://github.com/abseil/abseil-cpp/archive/0ef3ef432996de4c5afa879b93b2ba4f6c130ab2.tar.gz"],
strip_prefix = "abseil-cpp-b2dd3a5be797f8194bbc230c65f35aadd3998535",
urls = ["https://github.com/abseil/abseil-cpp/archive/b2dd3a5be797f8194bbc230c65f35aadd3998535.tar.gz"],
)

http_archive(
21 changes: 10 additions & 11 deletions tests/patches/abseil-cpp.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
--- MODULE.bazel
+++ MODULE.bazel
@@ -0,0 +1,10 @@
+module(
+ name = "abseil-cpp",
+ version = "20230125.1",
+ compatibility_level = 1,
+)
+bazel_dep(name = "rules_cc", version = "0.0.8")
+bazel_dep(name = "platforms", version = "0.0.6")
+bazel_dep(name = "bazel_skylib", version = "1.4.2")
+bazel_dep(name = "googletest", version = "1.12.1", repo_name = "com_google_googletest")
+bazel_dep(name = "google_benchmark", version = "1.8.3", repo_name = "com_github_google_benchmark")
@@ -28,8 +28,7 @@ bazel_dep(name = "bazel_skylib",

bazel_dep(name = "google_benchmark",
version = "1.8.3",
- repo_name = "com_github_google_benchmark",
- dev_dependency = True)
+ repo_name = "com_github_google_benchmark")

bazel_dep(name = "googletest",
version = "1.14.0.bcr.1",
3 changes: 1 addition & 2 deletions tests/scripts/run_external_tests.sh
Original file line number Diff line number Diff line change
@@ -55,5 +55,4 @@ absl_targets=($("${bazel}" query "${common_args[@]}" 'attr(timeout, short, tests
-@io_bazel_rules_go//tests/core/cgo:cc_libs_test \
-@io_bazel_rules_go//tests/core/cgo:external_includes_test \
"${absl_targets[@]}" \
-@com_google_absl//absl/time/internal/cctz:time_zone_format_test \
-@com_google_absl//absl/time/internal/cctz:civil_time_test
-@com_google_absl//absl/time/internal/cctz:time_zone_format_test