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.

Sign up for GitHub

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

Jump to bottom

remove tidb version from build #627

Merged
merged 3 commits into from
Jul 5, 2019
Merged

remove tidb version from build #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d88f2e
remove tidb version from build
weekface Jul 3, 2019
ef88505
Merge branch 'master' into fix-build
weekface Jul 3, 2019
aa7aa03
Merge branch 'master' into fix-build
weekface Jul 4, 2019
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
6 changes: 0 additions & 6 deletions hack/version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/usr/bin/env bash
set -euo pipefail

TIDB_VERSION=${TIDB_VERSION:-2.1.0}

# -----------------------------------------------------------------------------
# Version management helpers. These functions help to set the
# following variables:
Expand Down Expand Up @@ -81,10 +79,6 @@ function tidb_operator::version::ldflags() {
ldflags+=($(tidb_operator::version::ldflag "gitVersion" "${GIT_VERSION}"))
fi

if [[ -n ${TIDB_VERSION-} ]]; then
ldflags+=($(tidb_operator::version::ldflag "tidbVersion" "${TIDB_VERSION}"))
fi

# The -ldflags parameter takes a single string, so join the output.
echo "${ldflags[*]-}"
}
Expand Down
1 change: 0 additions & 1 deletion version/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ package version

// Info contains versioning information.
type Info struct {
TiDBVersion string `json:"tidbVersion"`
GitVersion string `json:"gitVersion"`
GitCommit string `json:"gitCommit"`
GitTreeState string `json:"gitTreeState"`
Expand Down
4 changes: 0 additions & 4 deletions version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ import (
)

var (
// tidbVersion and tidbVersion will be set during make
tidbVersion = "None"

gitVersion = "v0.0.0-master+$Format:%h$"
gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
gitTreeState = "" // state of git tree, either "clean" or "dirty"
Expand All @@ -47,7 +44,6 @@ func LogVersionInfo() {
func Get() Info {
// These variables typically come from -ldflags settings and in
return Info{
TiDBVersion: tidbVersion,
GitVersion: gitVersion,
GitCommit: gitCommit,
GitTreeState: gitTreeState,
Expand Down