From b18fc368fa5a2a57b4916ecf96e1d662b5d7a818 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Fri, 3 Jul 2026 17:34:51 +0800 Subject: [PATCH 1/6] bazel: upgrade rules_go v0.61.1 Signed-off-by: Weizhen Wang --- WORKSPACE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index db43b18dda396..0e88e42fc0cfa 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -40,11 +40,11 @@ versions.check(minimum_bazel_version = "6.0.0") http_archive( name = "io_bazel_rules_go", - sha256 = "86d3dc8f59d253524f933aaf2f3c05896cb0b605fc35b460c0b4b039996124c6", + sha256 = "763f4a3f6b03469fdb00a77a333dd0b5546d3ee1fa29db373128c08fee73e0e8", urls = [ - "https://cache.hawkingrei.com/bazel-contrib/rules_go/releases/download/v0.60.0/rules_go-v0.60.0.zip", - "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.60.0/rules_go-v0.60.0.zip", - "https://github.com/bazel-contrib/rules_go/releases/download/v0.60.0/rules_go-v0.60.0.zip", + "https://cache.hawkingrei.com/bazel-contrib/rules_go/releases/download/v0.61.1/rules_go-v0.61.1.zip", + "https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.61.1/rules_go-v0.61.1.zip", + "https://github.com/bazel-contrib/rules_go/releases/download/v0.61.1/rules_go-v0.61.1.zip", ], ) From e3e020bb019eef1353b6c30c7744cd72dea19713 Mon Sep 17 00:00:00 2001 From: Hawkingrei Date: Fri, 3 Jul 2026 18:00:14 +0800 Subject: [PATCH 2/6] bazel: upgrade platforms to 1.1.0 --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0e88e42fc0cfa..5524a4558ffa6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,10 +2,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "platforms", - sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8", + sha256 = "dbad4a23abcca6171e47b79edc53bd6a41067a3b75f9e8b104656b459ff25046", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/1.0.0/platforms-1.0.0.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/1.0.0/platforms-1.0.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/1.1.0/platforms-1.1.0.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/1.1.0/platforms-1.1.0.tar.gz", ], ) From ff6f5ae5421a2559dd2b61909108ce260574eafd Mon Sep 17 00:00:00 2001 From: Hawkingrei Date: Fri, 3 Jul 2026 18:12:30 +0800 Subject: [PATCH 3/6] bazel: upgrade bazel-skylib to 1.8.1 --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 5524a4558ffa6..37ea3057361ec 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,10 +27,10 @@ bazel_features_deps() http_archive( name = "bazel_skylib", - sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", + sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz", ], ) From bf55b64dcf485c8bab0a7ec26e7a9e52385d71c5 Mon Sep 17 00:00:00 2001 From: Hawkingrei Date: Fri, 3 Jul 2026 22:07:21 +0800 Subject: [PATCH 4/6] update Signed-off-by: Hawkingrei --- .bazelrc | 1 + WORKSPACE | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.bazelrc b/.bazelrc index f0b1ac149ba12..615b1b99e5b2c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,5 +1,6 @@ startup --host_jvm_args=-Xmx4g startup --unlimit_coredumps +common --noenable_bzlmod dump: --http_connector_attempts=2 dump: --http_connector_retry_max_timeout=5s run:ci --color=yes diff --git a/WORKSPACE b/WORKSPACE index 37ea3057361ec..8b624a44760af 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -16,9 +16,9 @@ host_platform_repo(name = "host_platform") http_archive( name = "bazel_features", - sha256 = "ba1282c1aa1d1fffdcf994ab32131d7c7551a9bc960fbf05f42d55a1b930cbfb", - strip_prefix = "bazel_features-1.15.0", - url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.15.0/bazel_features-v1.15.0.tar.gz", + sha256 = "9390b391a68d3b24aef7966bce8556d28003fe3f022a5008efc7807e8acaaf1a", + strip_prefix = "bazel_features-1.36.0", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.36.0/bazel_features-v1.36.0.tar.gz", ) load("@bazel_features//:deps.bzl", "bazel_features_deps") @@ -50,22 +50,24 @@ http_archive( http_archive( name = "bazel_gazelle", - sha256 = "675114d8b433d0a9f54d81171833be96ebc4113115664b791e6f204d58e93446", + sha256 = "49d9eba309b0b695824ff417d734242824ad9ab5edb56063b9d3400df1a61a56", urls = [ - "https://github.com/bazel-contrib/bazel-gazelle/releases/download/v0.47.0/bazel-gazelle-v0.47.0.tar.gz", - "https://cache.hawkingrei.com/bazel-contrib/bazel-gazelle/releases/download/v0.47.0/bazel-gazelle-v0.47.0.tar.gz", + "https://github.com/bazel-contrib/bazel-gazelle/releases/download/v0.51.3/bazel-gazelle-v0.51.3.tar.gz", + "https://cache.hawkingrei.com/bazel-contrib/bazel-gazelle/releases/download/v0.51.3/bazel-gazelle-v0.51.3.tar.gz", ], ) http_archive( name = "rules_cc", - sha256 = "d62624b45e0912713dcd3b8e30ba6ae55418ed6bf99e6d135cd61b8addae312b", - strip_prefix = "rules_cc-0.1.2", - urls = [ - "https://github.com/bazelbuild/rules_cc/releases/download/0.1.2/rules_cc-0.1.2.tar.gz", - ], + sha256 = "962251923438d27fc030c2d9d35c058a7f7da4fed42c42ad5342c7b4403d4cf2", + strip_prefix = "rules_cc-0.2.21", + url = "https://github.com/bazelbuild/rules_cc/releases/download/0.2.21/rules_cc-0.2.21.tar.gz", ) +load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") + +compatibility_proxy_repo() + http_archive( name = "rules_python", sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", @@ -140,11 +142,11 @@ http_archive( http_archive( name = "rules_proto", - sha256 = "303e86e722a520f6f326a50b41cfc16b98fe6d1955ce46642a5b7a67c11c0f5d", - strip_prefix = "rules_proto-6.0.0", + sha256 = "0e5c64a2599a6e26c6a03d6162242d231ecc0de219534c38cb4402171def21e8", + strip_prefix = "rules_proto-7.0.2", urls = [ - "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz", - "https://cache.hawkingrei.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz", + "https://github.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz", + "https://cache.hawkingrei.com/bazelbuild/rules_proto/releases/download/7.0.2/rules_proto-7.0.2.tar.gz", ], ) From 252752af35def7b9b058e615b466b92ab1354814 Mon Sep 17 00:00:00 2001 From: Hawkingrei Date: Fri, 3 Jul 2026 23:58:45 +0800 Subject: [PATCH 5/6] bazel: rely on rules_go rules_cc dependency --- WORKSPACE | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8b624a44760af..bb9b6598e877f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -57,17 +57,6 @@ http_archive( ], ) -http_archive( - name = "rules_cc", - sha256 = "962251923438d27fc030c2d9d35c058a7f7da4fed42c42ad5342c7b4403d4cf2", - strip_prefix = "rules_cc-0.2.21", - url = "https://github.com/bazelbuild/rules_cc/releases/download/0.2.21/rules_cc-0.2.21.tar.gz", -) - -load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo") - -compatibility_proxy_repo() - http_archive( name = "rules_python", sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3", From c6f3b9446f63408d9565c4a4a2bd297553fcec2e Mon Sep 17 00:00:00 2001 From: Hawkingrei Date: Sat, 4 Jul 2026 13:29:34 +0800 Subject: [PATCH 6/6] bazel: sync before bazel build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fdf2b61dd800d..8040a27e10a4f 100644 --- a/Makefile +++ b/Makefile @@ -754,7 +754,7 @@ bazel_bin: ## Build importer/tidb binary files with Bazel build system cp -f ${IMPORTER_PATH} ./bin/ ; .PHONY: bazel_build -bazel_build: ## Build TiDB using Bazel build system +bazel_build: bazel_sync ## Build TiDB using Bazel build system mkdir -p bin bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \ //... --//build:with_nogo_flag=$(NOGO_FLAG) @@ -925,7 +925,7 @@ bazel_mirror: .PHONY: bazel_sync bazel_sync: - bazel $(BAZEL_GLOBAL_CONFIG) sync $(BAZEL_SYNC_CONFIG) + bazel $(BAZEL_GLOBAL_CONFIG) sync --configure $(BAZEL_SYNC_CONFIG) .PHONY: bazel_mirror_upload bazel_mirror_upload: