Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into tidb_memory_debug…
Browse files Browse the repository at this point in the history
…_mode
  • Loading branch information
wshwsh12 committed Jul 7, 2022
2 parents cd4399b + 7d37ac1 commit ff6b1ef
Show file tree
Hide file tree
Showing 819 changed files with 52,894 additions and 31,591 deletions.
6 changes: 3 additions & 3 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ run --color=yes
build:release --workspace_status_command=./build/print-workspace-status.sh --stamp
build:release --config=ci
build --incompatible_strict_action_env --incompatible_enable_cc_toolchain_resolution
build:ci --remote_cache=http://172.16.4.3:8084/tidb
build:ci --remote_cache=http://172.16.4.21:8080/tidb --remote_timeout="10s"
test:ci --verbose_failures
test:ci --test_timeout=180
test:ci --test_env=GO_TEST_WRAP_TESTV=1
test:ci --remote_cache=http://172.16.4.3:8084/tidb
test:ci --test_env=GO_TEST_WRAP_TESTV=1 --test_verbose_timeout_warnings
test:ci --remote_cache=http://172.16.4.21:8080/tidb --remote_timeout="10s"
test:ci --test_env=TZ=Asia/Shanghai --test_output=errors --experimental_ui_max_stdouterr_bytes=104857600
2 changes: 1 addition & 1 deletion .github/licenserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ header:
- '**/*.result'
- '**/*.example'
- '**/*.patch'
- 'DEPS.bzl'
- '**/*.bzl'
- '.codecov.yml'
- 'Jenkinsfile'
- '.editorconfig'
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/integration-test-with-real-tikv.yml

This file was deleted.

1 change: 1 addition & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
# gazelle:prefix github.com/pingcap/tidb
# gazelle:exclude tidb-binlog/proto/proto
# gazelle:exclude plugin/conn_ip_example
# gazelle:exclude build/linter/staticcheck
gazelle(name = "gazelle")

package(default_visibility = ["//visibility:public"])
Expand Down
Loading

0 comments on commit ff6b1ef

Please sign in to comment.