Skip to content

Commit

Permalink
Merge branch 'master' of github.com:pingcap/tidb into issue49033
Browse files Browse the repository at this point in the history
  • Loading branch information
XuHuaiyu committed Dec 13, 2023
2 parents 49b5a2d + 9322568 commit 697daed
Show file tree
Hide file tree
Showing 361 changed files with 20,874 additions and 14,219 deletions.
3 changes: 3 additions & 0 deletions .github/licenserc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ header:
- "**/BUILD.bazel"
- "WORKSPACE"
- "WORKSPACE.patchgo"
- "MODULE.bazel"
- "MODULE.bazel.lock"
- ".bazelrc"
- "**/*.key"
- "**/*.md"
Expand All @@ -28,6 +30,7 @@ header:
- "**/*.example"
- "**/*.patch"
- "**/*.bzl"
- "**/.git/**"
- ".codecov.yml"
- "Jenkinsfile"
- ".editorconfig"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ bazel-tidb
/oom_record/
*.log.json
genkeyword
test_coverage
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Builder image
FROM rockylinux:9 as builder

ENV GOLANG_VERSION 1.21.1
ENV GOLANG_VERSION 1.21.5
ENV ARCH amd64
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
ENV GOPATH /go
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.enterprise
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Builder image
FROM rockylinux:9 as builder

ENV GOLANG_VERSION 1.21.1
ENV GOLANG_VERSION 1.21.5
ENV ARCH amd64
ENV GOLANG_DOWNLOAD_URL https://dl.google.com/go/go$GOLANG_VERSION.linux-$ARCH.tar.gz
ENV GOPATH /go
Expand Down
6 changes: 6 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################
Loading

0 comments on commit 697daed

Please sign in to comment.