Skip to content

Commit

Permalink
Merge branch 'master' into gctuner
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkingrei authored Oct 9, 2022
2 parents b202800 + be54582 commit 7c98247
Show file tree
Hide file tree
Showing 43 changed files with 805 additions and 652 deletions.
24 changes: 12 additions & 12 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2316,8 +2316,8 @@ def go_deps():
name = "com_github_mattn_go_runewidth",
build_file_proto_mode = "disable",
importpath = "github.com/mattn/go-runewidth",
sum = "h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=",
version = "v0.0.13",
sum = "h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=",
version = "v0.0.14",
)
go_repository(
name = "com_github_mattn_goveralls",
Expand Down Expand Up @@ -2375,8 +2375,8 @@ def go_deps():
name = "com_github_mgechev_revive",
build_file_proto_mode = "disable",
importpath = "github.com/mgechev/revive",
sum = "h1:a+itKsYpxka50MyaWQW1XCZ1vwfgjzVy/OzZ7DC/4+U=",
version = "v1.2.4-0.20220827111817-553604eaced5",
sum = "h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI=",
version = "v1.2.4",
)

go_repository(
Expand Down Expand Up @@ -2993,8 +2993,8 @@ def go_deps():
patches = [
"//build/patches:com_github_rivo_uniseg.patch",
],
sum = "h1:3Z3Eu6FGHZWSfNKJTOUiPatWwfc7DzJRU04jFUqJODw=",
version = "v0.3.4",
sum = "h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=",
version = "v0.4.2",
)
go_repository(
name = "com_github_rlmcpherson_s3gof3r",
Expand Down Expand Up @@ -3422,8 +3422,8 @@ def go_deps():
name = "com_github_tikv_client_go_v2",
build_file_proto_mode = "disable_global",
importpath = "github.com/tikv/client-go/v2",
sum = "h1:GJNu6XDT8W2Oahh+w/fhb37PNhFr4EZjdehIklZnhU4=",
version = "v2.0.1-0.20220921101651-ce9203ef66e9",
sum = "h1:TxDSQAmtGdE34BvOaYF35mRrAXePeZEq8quvuAwrKsI=",
version = "v2.0.1-0.20220923061703-33efe476e022",
)
go_repository(
name = "com_github_tikv_pd_client",
Expand Down Expand Up @@ -4321,8 +4321,8 @@ def go_deps():
name = "org_golang_x_sys",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/sys",
sum = "h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho=",
version = "v0.0.0-20220909162455-aba9fc2a8ff2",
sum = "h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=",
version = "v0.0.0-20220928140112-f11e5e49a4ec",
)
go_repository(
name = "org_golang_x_term",
Expand Down Expand Up @@ -4454,8 +4454,8 @@ def go_deps():
name = "org_uber_go_atomic",
build_file_proto_mode = "disable_global",
importpath = "go.uber.org/atomic",
sum = "h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=",
version = "v1.9.0",
sum = "h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=",
version = "v1.10.0",
)
go_repository(
name = "org_uber_go_automaxprocs",
Expand Down
9 changes: 2 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dev: checklist check explaintest gogenerate br_unit_test test_part_parser_dev ut
# Install the check tools.
check-setup:tools/bin/revive

check: parser_yacc check-parallel lint tidy testSuite errdoc bazel_all_build
check: parser_yacc check-parallel lint tidy testSuite errdoc

fmt:
@echo "gofmt (simplify)"
Expand Down Expand Up @@ -409,15 +409,10 @@ bazel_coverage_test: failpoint-enable bazel_ci_prepare
-- //... -//cmd/... -//tests/graceshutdown/... \
-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...

bazel_all_build: bazel_ci_prepare
mkdir -p bin
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
//... --//build:with_nogo_flag=true

bazel_build: bazel_ci_prepare
mkdir -p bin
bazel $(BAZEL_GLOBAL_CONFIG) build $(BAZEL_CMD_CONFIG) \
//cmd/importer:importer //tidb-server:tidb-server //tidb-server:tidb-server-check --//build:with_nogo_flag=true
//... --//build:with_nogo_flag=true
cp bazel-out/k8-fastbuild/bin/tidb-server/tidb-server_/tidb-server ./bin
cp bazel-out/k8-fastbuild/bin/cmd/importer/importer_/importer ./bin
cp bazel-out/k8-fastbuild/bin/tidb-server/tidb-server-check_/tidb-server-check ./bin
Expand Down
5 changes: 1 addition & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,15 @@ http_archive(
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
load("//:DEPS.bzl", "go_deps")
load("//build:lint.bzl", "nogo_deps")

# gazelle:repository_macro DEPS.bzl%go_deps
go_deps()

nogo_deps()

go_rules_dependencies()

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

gazelle_dependencies()
Expand Down
Empty file.
1 change: 1 addition & 0 deletions br/pkg/lightning/backend/kv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ go_test(
"sql2kv_test.go",
],
flaky = True,
race = "on",
deps = [
":kv",
"//br/pkg/lightning/common",
Expand Down
1 change: 1 addition & 0 deletions br/pkg/lightning/checkpoints/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ go_test(
],
embed = [":checkpoints"],
flaky = True,
race = "on",
deps = [
"//br/pkg/lightning/checkpoints/checkpointspb",
"//br/pkg/lightning/config",
Expand Down
1 change: 1 addition & 0 deletions br/pkg/rtree/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ go_test(
"rtree_test.go",
],
flaky = True,
race = "on",
deps = [
":rtree",
"//testkit/testsetup",
Expand Down
21 changes: 0 additions & 21 deletions build/lint.bzl

This file was deleted.

Loading

0 comments on commit 7c98247

Please sign in to comment.