Skip to content

Commit

Permalink
build: remove esv5 tag (#2318)
Browse files Browse the repository at this point in the history
* build: remove esv5 argument
* validate: remove esv5 build step
  • Loading branch information
kylebrandt authored Sep 25, 2018
1 parent d400f79 commit c40cfdf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
4 changes: 0 additions & 4 deletions build/build.go
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
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

0 comments on commit c40cfdf

Please sign in to comment.