Skip to content

Commit ed1cd4d

Browse files
committed
Add hotfix and check for go version
1 parent 9f8c111 commit ed1cd4d

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

tools/build_version_flags.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,24 @@ DEFAULT_BUILD_GIT_REV=$(git rev-parse HEAD)
2525
DEFAULT_BUILD_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
2626
DEFAULT_BUILD_TIME=$(LC_ALL=C date)
2727

28-
echo "\
28+
GO_MINOR_VER=$(go version | cut -d ' ' -f 3 | cut -d '.' -f 2)
29+
if [[ $((GO_MINOR_VER)) -ge 23 ]]; then
30+
echo "\
2931
-X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \
3032
-X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \
3133
-X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \
3234
-X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \
3335
-X 'vitess.io/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \
3436
-X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \
3537
-checklinkname=0
36-
"
38+
"
39+
else
40+
echo "\
41+
-X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \
42+
-X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \
43+
-X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \
44+
-X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \
45+
-X 'vitess.io/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \
46+
-X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \
47+
"
48+
fi

0 commit comments

Comments
 (0)