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.

Sign up for GitHub

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

Downgrade abseil-cpp #22695

Closed
wants to merge 1 commit into from
Closed

Downgrade abseil-cpp #22695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ bazel_dep(name = "rules_python", version = "0.28.0")
bazel_dep(name = "rules_testing", version = "0.6.0")
bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest")
bazel_dep(name = "with_cfg.bzl", version = "0.2.4")
bazel_dep(name = "abseil-cpp", version = "20240116.2")
bazel_dep(name = "abseil-cpp", version = "20230802.1")

# TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0.
bazel_dep(name = "buildozer", version = "7.1.2")
Expand Down Expand Up @@ -65,16 +65,6 @@ single_version_override(
],
)

# Remove the following patch when the following commit is in a release.
# https://github.com/abseil/abseil-cpp/commit/65a55c2ba891f6d2492477707f4a2e327a0b40dc
single_version_override(
module_name = "abseil-cpp",
patch_strip = 1,
patches = [
"//third_party:abseil-cpp-macos-fix.patch",
],
)

# The following Bazel modules are not direct dependencies for building Bazel,
# but are required for visibility from DIST_ARCHIVE_REPOS in repositories.bzl
bazel_dep(name = "apple_support", version = "1.8.1")
Expand Down
8 changes: 4 additions & 4 deletions MODULE.bazel.lock
View file
Open in desktop

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

12 changes: 11 additions & 1 deletion src/test/py/bazel/bazel_server_mode_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,24 @@
class BazelServerModeTest(test_base.TestBase):

def testBazelServerMode(self):
self.ScratchFile('WORKSPACE')
self.ScratchFile('MODULE.bazel')

_, stdout, _ = self.RunBazel(['info', 'server_pid'])
pid1 = stdout[0]
_, stdout, _ = self.RunBazel(['info', 'server_pid'])
pid2 = stdout[0]
self.assertEqual(pid1, pid2)

def testBazelServerModeStressTest(self):
meteorcloudy marked this conversation as resolved.
Show resolved Hide resolved
self.ScratchFile('MODULE.bazel')

last_pid = None
for _ in range(10):
_, stdout, _ = self.RunBazel(['--ignore_all_rc_files', 'info', 'server_pid'])
new_pid = stdout[0]
if last_pid is not None:
self.assertEqual(last_pid, new_pid)
last_pid = new_pid

if __name__ == '__main__':
absltest.main()
Loading