From 3eabea5788e42676ccd3f82cba84d9ee91391c1a Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Thu, 5 Dec 2024 23:59:40 -0800 Subject: [PATCH 1/3] Update MODULE.bazel and workspace_deps.bzl --- MODULE.bazel | 7 +++++++ workspace_deps.bzl | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 5bd1735c6ac369..e8c83db5c2904f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -67,6 +67,13 @@ single_version_override( patches = ["//third_party:rules_graalvm_fix.patch"], ) +archive_override( + module_name = "rules_java", + urls = ["https://github.com/bazelbuild/rules_java/archive/94d5a8103844c07547922a15fe1eff80ea303f32.tar.gz"], + integrity = "sha256-6srPV3i7qSvZdbRufg/KkSsQfnEx4meOXO+6tjZ1/p4=", + strip_prefix = "rules_java-94d5a8103844c07547922a15fe1eff80ea303f32", +) + local_path_override( module_name = "remoteapis", path = "./third_party/remoteapis", diff --git a/workspace_deps.bzl b/workspace_deps.bzl index 463d029859fb28..e26172e1ecd27f 100644 --- a/workspace_deps.bzl +++ b/workspace_deps.bzl @@ -31,9 +31,10 @@ WORKSPACE_REPOS = { "strip_prefix": "protobuf-29.0-rc3", }, "rules_java": { - "archive": "rules_java-8.5.1.tar.gz", - "sha256": "1389206b2208c5f33a05dd96e51715b0855c480c082b7bb4889a8e07fcff536c", - "urls": ["https://github.com/bazelbuild/rules_java/releases/download/8.5.1/rules_java-8.5.1.tar.gz"], + "archive": "94d5a8103844c07547922a15fe1eff80ea303f32.tar.gz", + "sha256": "eacacf5778bba92bd975b46e7e0fca912b107e7131e2678e5cefbab63675fe9e", + "strip_prefix": "rules_java-94d5a8103844c07547922a15fe1eff80ea303f32", + "urls": ["https://github.com/bazelbuild/rules_java/archive/94d5a8103844c07547922a15fe1eff80ea303f32.tar.gz"], }, "bazel_skylib": { "archive": "bazel-skylib-1.6.1.tar.gz", From c566f3d393511acbfdb93710982960e6caae5807 Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Fri, 6 Dec 2024 00:02:49 -0800 Subject: [PATCH 2/3] Temp changes --- .bazelrc | 2 +- repositories.bzl | 2 +- src/test/shell/bazel/BUILD | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bazelrc b/.bazelrc index c5c66abb9644e9..23bf1d34664ea6 100644 --- a/.bazelrc +++ b/.bazelrc @@ -82,7 +82,7 @@ test:ci-linux --test_env=TEST_INSTALL_BASE=/var/lib/buildkite-agent/bazeltest/in test:ci-linux --test_env=REPOSITORY_CACHE=/var/lib/buildkite-agent/bazeltest/repo_cache test:ci-linux --test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80 test:ci-linux --sandbox_writable_path=/var/lib/buildkite-agent/bazeltest -test:ci-linux --sandbox_default_allow_network=false +test:ci-linux --sandbox_default_allow_network=true ## For macOS common:ci-macos --config=ci-common diff --git a/repositories.bzl b/repositories.bzl index 208ac98822cf27..28d4d7083a0ccd 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -39,7 +39,7 @@ DIST_ARCHIVE_REPOS = [get_canonical_repo_name(repo) for repo in [ "rules_cc", "rules_go", "rules_graalvm", - "rules_java", + # "rules_java", "rules_jvm_external", "rules_kotlin", "rules_license", diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 743d696c5dc195..a89ff8667989d4 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -1196,7 +1196,7 @@ sh_test( "@bazel_tools//tools/bash/runfiles", ], exec_compatible_with = ["//:highcpu_machine"], - tags = ["block-network"], + # tags = ["block-network"], ) sh_test( @@ -1215,7 +1215,7 @@ sh_test( ], exec_compatible_with = ["//:highcpu_machine"], tags = [ - "block-network", + # "block-network", "no_windows", ], ) From 61f0d9526c8b58ca28eba8af89ae80ff93f1289e Mon Sep 17 00:00:00 2001 From: iancha1992 Date: Fri, 6 Dec 2024 22:53:09 +0000 Subject: [PATCH 3/3] Update lockfiles --- MODULE.bazel.lock | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index c263f14469a0fa..2f2323fadaf882 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -127,7 +127,6 @@ "https://bcr.bazel.build/modules/rules_apple/3.5.1/MODULE.bazel": "3d1bbf65ad3692003d36d8a29eff54d4e5c1c5f4bfb60f79e28646a924d9101c", "https://bcr.bazel.build/modules/rules_apple/3.5.1/source.json": "e7593cdf26437d35dbda64faeaf5b82cbdd9df72674b0f041fdde75c1d20dda7", "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", - "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", "https://bcr.bazel.build/modules/rules_cc/0.0.14/MODULE.bazel": "5e343a3aac88b8d7af3b1b6d2093b55c347b8eefc2e7d1442f7a02dc8fea48ac", "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc", @@ -154,18 +153,6 @@ "https://bcr.bazel.build/modules/rules_go/0.48.0/source.json": "895dc1698fd7c5959f92868f3a87156ad1ed8d876668bfa918fa0a623fb1eb22", "https://bcr.bazel.build/modules/rules_graalvm/0.11.1/MODULE.bazel": "0caaea2dff60b70b8f9b9ceb6e5ae815b85ae610a0392433a22c755b2f2c2456", "https://bcr.bazel.build/modules/rules_graalvm/0.11.1/source.json": "23d59a63e1dce95df987d19284bad81a4bf7e4df788d47b0ad99c217447bceca", - "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", - "https://bcr.bazel.build/modules/rules_java/5.1.0/MODULE.bazel": "324b6478b0343a3ce7a9add8586ad75d24076d6d43d2f622990b9c1cfd8a1b15", - "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", - "https://bcr.bazel.build/modules/rules_java/6.4.0/MODULE.bazel": "e986a9fe25aeaa84ac17ca093ef13a4637f6107375f64667a15999f77db6c8f6", - "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31", - "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6", - "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab", - "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel": "a592852f8a3dd539e82ee6542013bf2cadfc4c6946be8941e189d224500a8934", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/7.6.5/MODULE.bazel": "481164be5e02e4cab6e77a36927683263be56b7e36fef918b458d7a8a1ebadb1", - "https://bcr.bazel.build/modules/rules_java/8.6.1/MODULE.bazel": "f4808e2ab5b0197f094cabce9f4b006a27766beb6a9975931da07099560ca9c2", - "https://bcr.bazel.build/modules/rules_java/8.6.1/source.json": "f18d9ad3c4c54945bf422ad584fa6c5ca5b3116ff55a5b1bc77e5c1210be5960", "https://bcr.bazel.build/modules/rules_jvm_external/6.5/MODULE.bazel": "54f3e81ae9b57ede5916c9a48add664dc30a5ce3855376b51ae7d6f23405daf8", "https://bcr.bazel.build/modules/rules_jvm_external/6.5/source.json": "5b8bed439771269d9c0af57cf4326cbfd2462e49ebb11230499aaa11fe70f3db", "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3", @@ -182,7 +169,6 @@ "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7", "https://bcr.bazel.build/modules/rules_proto/6.0.0-rc1/MODULE.bazel": "1e5b502e2e1a9e825eef74476a5a1ee524a92297085015a052510b09a1a09483", "https://bcr.bazel.build/modules/rules_proto/6.0.0/MODULE.bazel": "b531d7f09f58dce456cd61b4579ce8c86b38544da75184eadaf0a7cb7966453f", - "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73", "https://bcr.bazel.build/modules/rules_proto/7.0.2/MODULE.bazel": "bf81793bd6d2ad89a37a40693e56c61b0ee30f7a7fdbaf3eabbf5f39de47dea2", "https://bcr.bazel.build/modules/rules_proto/7.0.2/source.json": "1e5e7260ae32ef4f2b52fd1d0de8d03b606a44c91b694d2f1afb1d3b28a48ce1", "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", @@ -203,7 +189,6 @@ "https://bcr.bazel.build/modules/rules_swift/1.18.0/source.json": "9e636cabd446f43444ea2662341a9cbb74ecd87ab0557225ae73f1127cb7ff52", "https://bcr.bazel.build/modules/rules_testing/0.6.0/MODULE.bazel": "8518d53bc742c462536d3f1a0de0c265bd7b51f32797fea4132007223ed2926f", "https://bcr.bazel.build/modules/rules_testing/0.6.0/source.json": "915ae13ae2247c986cc57289f21e7f1d9711cd2ecfdf5867b51dc0484f3b043b", - "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c", "https://bcr.bazel.build/modules/stardoc/0.7.1/MODULE.bazel": "3548faea4ee5dda5580f9af150e79d0f6aea934fc60c1cc50f4efdd9420759e7", "https://bcr.bazel.build/modules/stardoc/0.7.1/source.json": "b6500ffcd7b48cd72c29bb67bcac781e12701cc0d6d55d266a652583cfcdab01", "https://bcr.bazel.build/modules/upb/0.0.0-20211020-160625a/MODULE.bazel": "6cced416be2dc5b9c05efd5b997049ba795e5e4e6fafbe1624f4587767638928", @@ -1319,8 +1304,8 @@ }, "@@rules_java+//java:rules_java_deps.bzl%compatibility_proxy": { "general": { - "bzlTransitiveDigest": "kFNgYOjJGABexRi0wd2ZNysJhy5YjAZYTI7/GThoO78=", - "usagesDigest": "jTQDdLDxsS43zuRmg1faAjIEPWdLAbDAowI1pInQSoo=", + "bzlTransitiveDigest": "DRCBmRABnumUM9R6A2zGIK1jy7SWrfteZxQSxBHESH0=", + "usagesDigest": "bG8j4783YfaAVBNCcNw3icYfhMy4YSU7hEK/OnPi77w=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {},