Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align protobuf package version and proto options with kvproto #347

Merged
merged 6 commits into from
Nov 5, 2024

Conversation

overvenus
Copy link
Member

What problem does this PR solve?

Align protobuf package version proto options with kvproto.

Tests:

# pwd: tipb
cd ../tidb
git diff 
diff --git a/go.mod b/go.mod
index 4473dadedd..2f61627095 100644
--- a/go.mod
+++ b/go.mod
@@ -326,4 +326,6 @@ replace (
        // Please remove these dependencies.
        sourcegraph.com/sourcegraph/appdash => github.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
        sourcegraph.com/sourcegraph/appdash-data => github.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67
+
+       github.com/pingcap/tipb => ../tipb
 )
make
CGO_ENABLED=1  GO111MODULE=on go build -tags codes  -ldflags '-X "github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=v8.5.0-alpha-26-g6679c7449d-dirty" -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBBuildTS=2024-11-01 05:41:27" -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitHash=6679c7449d8edc45a635ce950f077d6ea8b58843" -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitBranch=master" -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=Community" ' -o bin/tidb-server ./cmd/tidb-server
Build TiDB Server successfully!

Signed-off-by: Neil Shen <[email protected]>
Signed-off-by: Neil Shen <[email protected]>
@overvenus overvenus changed the title Unify options Align protobuf package version and proto options with kvproto. Nov 1, 2024
@overvenus overvenus changed the title Align protobuf package version and proto options with kvproto. Align protobuf package version and proto options with kvproto Nov 1, 2024
Signed-off-by: Neil Shen <[email protected]>
Signed-off-by: Neil Shen <[email protected]>
tiancaiamao
tiancaiamao previously approved these changes Nov 1, 2024
nolouch
nolouch previously approved these changes Nov 5, 2024
Copy link
Member

@nolouch nolouch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest lgtm

@nolouch
Copy link
Member

nolouch commented Nov 5, 2024

/merge

@overvenus overvenus dismissed stale reviews from nolouch and tiancaiamao via c941ab5 November 5, 2024 05:20
@overvenus overvenus merged commit f91fdb8 into pingcap:master Nov 5, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants