Skip to content

Commit a73e763

Browse files
committed
Add hotfix and check for go version
1 parent fb11e05 commit a73e763

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

tools/build_version_flags.sh

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,24 @@ source $DIR/shell_functions.inc
2424
DEFAULT_BUILD_GIT_REV=$(git rev-parse HEAD)
2525
DEFAULT_BUILD_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
2626

27-
echo "\
28-
-X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \
29-
-X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \
30-
-X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \
31-
-X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \
32-
-X 'vitess.io/vitess/go/vt/servenv.buildTime=$(LC_ALL=C date)' \
33-
-X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \
34-
-checklinkname=0
35-
"
27+
GO_MINOR_VER=$(go version | cut -d ' ' -f 3 | cut -d '.' -f 2)
28+
if [[ $((GO_MINOR_VER)) -ge 23 ]]; then
29+
echo "\
30+
-X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \
31+
-X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \
32+
-X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \
33+
-X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \
34+
-X 'vitess.io/vitess/go/vt/servenv.buildTime=$(LC_ALL=C date)' \
35+
-X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \
36+
-checklinkname=0
37+
"
38+
else
39+
echo "\
40+
-X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \
41+
-X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \
42+
-X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \
43+
-X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \
44+
-X 'vitess.io/vitess/go/vt/servenv.buildTime=$(LC_ALL=C date)' \
45+
-X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \
46+
"
47+
fi

0 commit comments

Comments
 (0)