From 9f8c111c63e17f2578bb51ee48fa66da00185aec Mon Sep 17 00:00:00 2001 From: Andy Edison Date: Mon, 26 Aug 2024 16:21:27 -0500 Subject: [PATCH 1/2] Add hotfix to make vitess compile under go 1.23 --- tools/build_version_flags.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/build_version_flags.sh b/tools/build_version_flags.sh index fc1733f767d..eb56ab96a99 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. @@ -32,4 +32,5 @@ echo "\ -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}' \ + -checklinkname=0 " From ed1cd4d91c1464469cfd209ee05ddf591822abdf Mon Sep 17 00:00:00 2001 From: Andy Edison Date: Tue, 27 Aug 2024 10:53:48 -0500 Subject: [PATCH 2/2] Add hotfix and check for go version --- tools/build_version_flags.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/build_version_flags.sh b/tools/build_version_flags.sh index eb56ab96a99..6dd030e5b9c 100755 --- a/tools/build_version_flags.sh +++ b/tools/build_version_flags.sh @@ -25,7 +25,9 @@ DEFAULT_BUILD_GIT_REV=$(git rev-parse HEAD) DEFAULT_BUILD_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) DEFAULT_BUILD_TIME=$(LC_ALL=C date) -echo "\ +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)' \ -X 'vitess.io/vitess/go/vt/servenv.buildGitRev=${BUILD_GIT_REV:-$DEFAULT_BUILD_GIT_REV}' \ @@ -33,4 +35,14 @@ echo "\ -X 'vitess.io/vitess/go/vt/servenv.buildTime=${BUILD_TIME:-$DEFAULT_BUILD_TIME}' \ -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