Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ run:ci --color=yes

build --announce_rc
build --experimental_guard_against_concurrent_changes
build --experimental_remote_merkle_tree_cache
build --java_language_version=17
build --java_runtime_version=17
build --tool_java_language_version=17
build --tool_java_runtime_version=17
build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
build:ci --color=yes
build:ci --experimental_remote_cache_compression
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.1
7.7.1
1,851 changes: 945 additions & 906 deletions DEPS.bzl

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ check-setup:tools/bin/revive
precheck: fmt bazel_prepare

.PHONY: check
check: check-bazel-prepare parser_yacc check-parallel lint tidy testSuite errdoc license
check: check-bazel-prepare parser_yacc check-parallel lint tidy testSuite errdoc license bazel_check_abi

.PHONY: fmt
fmt:
Expand Down Expand Up @@ -640,6 +640,14 @@ bazel_coverage_test_ddlargsv1: failpoint-enable bazel_ci_simple_prepare
-- //... -//cmd/... -//tests/graceshutdown/... \
-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...

.PHONY: bazel_bin
bazel_bin: ## Build importer/tidb binary files with Bazel build system
mkdir -p bin; \
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
//cmd/importer:importer //cmd/tidb-server:tidb-server --define gotags=$(BUILD_TAGS) --norun_validations ;\
cp -f ${TIDB_SERVER_PATH} ./bin/ ; \
cp -f ${IMPORTER_PATH} ./bin/ ;

.PHONY: bazel_build
bazel_build:
mkdir -p bin
Expand Down Expand Up @@ -826,3 +834,8 @@ bazel_sync:
.PHONY: bazel_mirror_upload
bazel_mirror_upload:
bazel $(BAZEL_GLOBAL_CONFIG) run $(BAZEL_CMD_CONFIG) //cmd/mirror -- --mirror --upload

.PHONY: bazel_check_abi
bazel_check_abi:
@echo "check ABI compatibility"
./tools/check/bazel-check-abi.sh
1 change: 1 addition & 0 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ FAIL_ON_STDOUT := awk '{ print } END { if (NR > 0) { exit 1 } }'
CURDIR := $(shell pwd)
path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH))):$(PWD)/tools/bin
export PATH := $(path_to_add):$(PATH)
export GOTOOLCHAIN := go1.25.5

GO := GO111MODULE=on go
BUILD_FLAG := -tags codes
Expand Down
92 changes: 56 additions & 36 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Required by toolchains_protoc.
http_archive(
name = "platforms",
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
"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",
],
sha256 = "3384eb1c30762704fbe38e440204e114154086c8fc8a8c2e3e28441028c019a8",
)

# To use the new Starlark host platform in @platforms, also include the following snippet:
load("@platforms//host:extension.bzl", "host_platform_repo")
host_platform_repo(name = "host_platform")

http_archive(
name = "bazel_features",
sha256 = "ba1282c1aa1d1fffdcf994ab32131d7c7551a9bc960fbf05f42d55a1b930cbfb",
Expand All @@ -33,42 +35,61 @@ http_archive(
)

load("@bazel_skylib//lib:versions.bzl", "versions")

versions.check(minimum_bazel_version = "6.0.0")

http_archive(
name = "io_bazel_rules_go",
sha256 = "f4a9314518ca6acfa16cc4ab43b0b8ce1e4ea64b81c38d8a3772883f153346b8",
sha256 = "68af54cb97fbdee5e5e8fe8d210d15a518f9d62abfd71620c3eaff3b26a5ff86",
urls = [
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
"http://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
"https://github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
"http://bazel-cache.pingcap.net:8080/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"http://ats.apps.svc/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"https://cache.hawkingrei.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
"https://github.com/bazel-contrib/rules_go/releases/download/v0.59.0/rules_go-v0.59.0.zip",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "8ad77552825b078a10ad960bec6ef77d2ff8ec70faef2fd038db713f410f5d87",
sha256 = "675114d8b433d0a9f54d81171833be96ebc4113115664b791e6f204d58e93446",
urls = [
"http://bazel-cache.pingcap.net:8080/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
"http://ats.apps.svc/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
"http://bazel-cache.pingcap.net:8080/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.47.0/bazel-gazelle-v0.47.0.tar.gz",
"http://ats.apps.svc/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",
],
)

http_archive(
name = "rules_cc",
sha256 = "d62624b45e0912713dcd3b8e30ba6ae55418ed6bf99e6d135cd61b8addae312b",
strip_prefix = "rules_cc-0.1.2",
urls = [
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
"https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
"http://ats.apps.svc/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_cc/releases/download/0.1.2/rules_cc-0.1.2.tar.gz",
"https://github.com/bazelbuild/rules_cc/releases/download/0.1.2/rules_cc-0.1.2.tar.gz",
"http://ats.apps.svc/bazelbuild/rules_cc/releases/download/0.1.2/rules_cc-0.1.2.tar.gz",
],
sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
strip_prefix = "rules_cc-0.0.6",
)

load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
http_archive(
name = "rules_python",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
urls = [
"http://bazel-cache.pingcap.net:8080/bazel-contrib/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
"https://github.com/bazel-contrib/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
"http://ats.apps.svc/bazel-contrib/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
"https://cache.hawkingrei.com/bazel-contrib/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
],
)

load("@rules_python//python:repositories.bzl", "py_repositories")

py_repositories()

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
load("//:DEPS.bzl", "go_deps")

# gazelle:repository_macro DEPS.bzl%go_deps
Expand All @@ -85,24 +106,23 @@ go_download_sdk(
"https://mirrors.aliyun.com/golang/{}",
"https://dl.google.com/go/{}",
],
version = "1.23.6",
version = "1.25.5",
)

gazelle_dependencies(go_sdk = "go_sdk")

go_register_toolchains(
nogo = "@//build:tidb_nogo",
)

gazelle_dependencies()

http_archive(
name = "com_google_protobuf",
sha256 = "bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b",
strip_prefix = "protobuf-3.15.5",
integrity = "sha256-zl0At4RQoMpAC/NgrADA1ZnMIl8EnZhqJ+mk45bFqEo=",
strip_prefix = "protobuf-29.0-rc2",
# latest, as of 2021-03-08
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/rules/protobuf-3.15.5.tar.gz ",
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz",
"https://github.com/protocolbuffers/protobuf/archive/v29.0-rc2.tar.gz",
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v29.0-rc2.tar.gz",
],
)

Expand All @@ -114,21 +134,21 @@ http_archive(
name = "remote_java_tools",
sha256 = "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools-v12.6.zip",
"http://ats.apps.svc/gomod/rules/java_tools-v12.6.zip",
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip",
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools-v12.6.zip",
"http://ats.apps.svc/gomod/rules/java_tools-v12.6.zip",
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip",
],
)

http_archive(
name = "remote_java_tools_linux",
sha256 = "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066",
urls = [
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools_linux-v12.6.zip",
"http://ats.apps.svc/gomod/rules/java_tools_linux-v12.6.zip",
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip",
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools_linux-v12.6.zip",
"http://ats.apps.svc/gomod/rules/java_tools_linux-v12.6.zip",
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip",
],
)

Expand Down
8 changes: 4 additions & 4 deletions build/image/base
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FROM quay.io/rockylinux/rockylinux:8.10.20240528
# setup mariadb repo
# ref: https://mariadb.com/docs/server/connect/clients/mariadb-client/#Linux_(Repository)
RUN curl -LsSO https://r.mariadb.com/downloads/mariadb_repo_setup \
&& echo "6083ef1974d11f49d42ae668fb9d513f7dc2c6276ffa47caed488c4b47268593 mariadb_repo_setup" | sha256sum -c - \
&& echo "7a3e1610fee91347e198214e3672a6d3932ccbbf67905d9e892e9255baaec292 mariadb_repo_setup" | sha256sum -c - \
&& chmod +x mariadb_repo_setup \
&& ./mariadb_repo_setup \
&& rm mariadb_repo_setup
Expand All @@ -30,7 +30,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \

# install golang toolchain
# renovate: datasource=docker depName=golang
ARG GOLANG_VERSION=1.23.6
ARG GOLANG_VERSION=1.25.5
RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \
curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz
ENV PATH /usr/local/go/bin/:$PATH
Expand Down Expand Up @@ -62,7 +62,7 @@ ENV PATH=$PATH:/opt/gradle-${GRADLE_VER}/bin

#### install tools: bazelisk, codecov, oras
# renovate: datasource=github-tags depName=bazelbuild/bazelisk
ADD https://github.com/bazelbuild/bazel/releases/download/6.5.0/bazel-6.5.0-linux-x86_64 /usr/bin/bazel
ADD https://github.com/bazelbuild/bazel/releases/download/7.7.1/bazel-7.7.1-linux-x86_64 /usr/bin/bazel
RUN chmod +x /usr/bin/bazel

# codecov tool
Expand All @@ -74,4 +74,4 @@ RUN folder=$([ "$(arch)" = "x86_64" ] && echo linux || echo aarch64); \

# oras tool
# renovate: datasource=github-tags depName=oras-project/oras
COPY --from=bitnami/oras:1.2.0 /oras /usr/local/bin/oras
COPY --from=public.ecr.aws/bitnami/oras:1.2.0 /oras /usr/local/bin/oras
2 changes: 1 addition & 1 deletion build/image/centos7_jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM hub.pingcap.net/wangweizhen/base_image:go12320241009
FROM hub.pingcap.net/wangweizhen/base_image:go12520251210
ENV GOPATH /go
ENV GOROOT /usr/local/go
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
Expand Down
2 changes: 1 addition & 1 deletion build/image/parser_test
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

FROM rockylinux:9

ENV GOLANG_VERSION 1.23.6
ENV GOLANG_VERSION 1.25.5
ENV ARCH amd64
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
ENV GOPATH /home/prow/go
Expand Down
3 changes: 1 addition & 2 deletions dumpling/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ Any questions? Let's discuss on [TiDB Internals forum](https://internals.tidb.io
Building
--------

0. Under directory `tidb`
1. Install Go 1.23.6 or above
1. Under directory `tidb`
2. Run `make build_dumpling` to compile. The output is in `bin/dumpling`.
3. Run `make dumpling_unit_test` to run the unit tests.
4. Run `make dumpling_integration_test` to run integration tests. For integration test:
Expand Down
Loading