From 614f88035f220cdc428662b66bff68ef17b18ff9 Mon Sep 17 00:00:00 2001 From: Andy Edison Date: Tue, 27 Aug 2024 12:40:01 -0500 Subject: [PATCH] Add hotfix and check for go version --- tools/build_version_flags.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/build_version_flags.sh b/tools/build_version_flags.sh index 9b473229180..cff8e853e2b 100755 --- a/tools/build_version_flags.sh +++ b/tools/build_version_flags.sh @@ -1,13 +1,13 @@ #!/bin/bash # Copyright 2019 The Vitess Authors. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +24,8 @@ source $DIR/shell_functions.inc DEFAULT_BUILD_GIT_REV=$(git rev-parse HEAD) DEFAULT_BUILD_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) +GO_MINOR_VER=$(go version | cut -d ' ' -f 3 | cut -d '.' -f 2) +if [[ $((GO_MINOR_VER)) -ge 23 ]]; then echo "\ -X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \ -X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \ @@ -31,4 +33,15 @@ echo "\ -X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \ -X 'vitess.io/vitess/go/vt/servenv.buildTime=$(LC_ALL=C date)' \ -X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \ -" + -checklinkname=0 + " +else + echo "\ + -X 'vitess.io/vitess/go/vt/servenv.buildHost=$(hostname)' \ + -X 'vitess.io/vitess/go/vt/servenv.buildUser=$(whoami)' \ + -X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \ + -X 'vitess.io/vitess/go/vt/servenv.buildGitBranch=${BUILD_GIT_BRANCH:-$DEFAULT_BUILD_GIT_BRANCH}' \ + -X 'vitess.io/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \ + -X 'vitess.io/vitess/go/vt/servenv.jenkinsBuildNumberStr=${BUILD_NUMBER}' \ + " +fi \ No newline at end of file