Skip to content

Commit

Permalink
Merge pull request #116 from github/hotfix-go1.23
Browse files Browse the repository at this point in the history
Add hotfix to make vitess v17 compile under go 1.23
  • Loading branch information
andyedison authored Aug 27, 2024
2 parents e36e3cb + ed1cd4d commit bfcb8fd
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions tools/build_version_flags.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -25,11 +25,24 @@ 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}' \
-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
"
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

0 comments on commit bfcb8fd

Please sign in to comment.