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

build: remove esv5 argument #2318

Merged
merged 2 commits into from
Sep 25, 2018
Merged

build: remove esv5 argument #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6abf486
build: remove esv5 argument
kylebrandt Sep 25, 2018
c2d8977
validate: remove esv5 build step
kylebrandt Sep 25, 2018
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
4 changes: 0 additions & 4 deletions build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var (
buildTsdb = flag.Bool("tsdbrelay", false, "Only build tsdbrelay")
buildScollector = flag.Bool("scollector", false, "Only build scollector.")
output = flag.String("output", "", "Output directory; defaults to $GOPATH/bin.")
esv5 = flag.Bool("esv5", false, "Build with esv5 support instead of v3")

allProgs = []string{"bosun", "scollector", "tsdbrelay"}
)
Expand Down Expand Up @@ -57,9 +56,6 @@ func main() {
} else {
args = append(args, "install")
}
if *esv5 {
args = append(args, "-tags", "esv5")
}
args = append(args, "-ldflags", ldFlags, fmt.Sprintf("bosun.org/cmd/%s", app))
fmt.Println("go", strings.Join(args, " "))
cmd := exec.Command("go", args...)
Expand Down
8 changes: 0 additions & 8 deletions build/validate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ for GOOS in darwin windows linux ; do
done
export GOOS=$ORIGINALGOOS

echo -e "\nBuilding with esv5 tag"
go build -tags="esv5" bosun.org/...
GBUILDRESULT=$?
if [ "$GBUILDRESULT" != 0 ]; then
BUILDMSG="${BUILDMSG}Does not build on ${GOOS} (esv5). "
GOBUILDRESULT=$GBUILDRESULT
fi

echo -e "\nChecking gofmt -s -w for all folders that don't start with . or _"
GOFMTRESULT=0
GOFMTOUT=$(gofmt -l -s -w $DIRS);
Expand Down