Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add hotfix to make vitess v17 compile under go 1.23 #116

Merged
merged 2 commits into from
Aug 27, 2024
Merged

Add hotfix to make vitess v17 compile under go 1.23 #116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f8c111
Add hotfix to make vitess compile under go 1.23
andyedison Aug 26, 2024
ed1cd4d
Add hotfix and check for go version
andyedison Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions tools/build_version_flags.sh
View file
Open in desktop
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
Loading