Skip to content

Commit 3ab5b60

Browse files
hvadehracopybara-github
authored andcommitted
Fix CI at head
Copybara Import from #491 BEGIN_PUBLIC Fix CI at head (#491) Upstream fix proposed in google/googletest#4836 Closes #491 END_PUBLIC COPYBARA_INTEGRATE_REVIEW=#491 from bazelbuild:hvd_fix_ci e44831c PiperOrigin-RevId: 807231844 Change-Id: I22d37eba5ef17d1495c5768d17f12323fb199610
1 parent 66542a1 commit 3ab5b60

File tree

3 files changed

+39
-1
lines changed

3 files changed

+39
-1
lines changed

MODULE.bazel

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,14 @@ register_toolchains(
1818
)
1919

2020
bazel_dep(name = "rules_shell", version = "0.2.0", dev_dependency = True)
21-
bazel_dep(name = "googletest", version = "1.15.2", dev_dependency = True)
21+
bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
22+
single_version_override(
23+
module_name = "googletest",
24+
patch_strip = 1,
25+
patches = ["//:googletest.patch"],
26+
version = "1.17.0",
27+
)
28+
2229
bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True)
2330
bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
2431

googletest.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff --git a/BUILD.bazel b/BUILD.bazel
2+
index 53501454..e85849d6 100644
3+
--- a/BUILD.bazel
4+
+++ b/BUILD.bazel
5+
@@ -29,6 +29,7 @@
6+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7+
#
8+
# Bazel Build for Google C++ Testing Framework(Google Test)
9+
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
10+
11+
package(default_visibility = ["//visibility:public"])
12+
13+
diff --git a/MODULE.bazel b/MODULE.bazel
14+
index 5cb0b156..683bf92b 100644
15+
--- a/MODULE.bazel
16+
+++ b/MODULE.bazel
17+
@@ -51,6 +51,10 @@ bazel_dep(
18+
name = "re2",
19+
version = "2024-07-02.bcr.1",
20+
)
21+
+bazel_dep(
22+
+ name = "rules_cc",
23+
+ version = "0.2.8",
24+
+)
25+
26+
bazel_dep(
27+
name = "rules_python",

tests/system_library/system_library_test.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ system_library(
7070
EOF
7171

7272
cat << EOF > MODULE.bazel
73+
bazel_dep(name = "rules_cc", version = "0.2.8")
74+
7375
system_library = use_repo_rule("//:cc/system_library.bzl", "system_library")
7476
7577
system_library(
@@ -94,6 +96,7 @@ system_library(
9496
EOF
9597

9698
cat << EOF > BUILD
99+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
97100
cc_binary(
98101
name = "test",
99102
srcs = ["test.cc"],
@@ -218,6 +221,7 @@ system_library(
218221
EOF
219222

220223
cat << EOF > BUILD
224+
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
221225
cc_binary(
222226
name = "test",
223227
srcs = ["test.cc"],

0 commit comments

Comments
 (0)