Skip to content

Commit 82c8007

Browse files
boyan-soubachovpgmsft
authored andcommitted
Fix binary generation for builds (#89)
* Fix the binary building script for TravisCI builds * Goimports code linting fixes
1 parent 2f83ae6 commit 82c8007

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ func runHTTPandHTTPSHandler(w http.ResponseWriter, r *http.Request, p EthrProtoc
581581
http.Error(w, "Only GET, PUT and POST are supported.", http.StatusMethodNotAllowed)
582582
return
583583
}
584-
if (testType == Bandwidth) {
584+
if testType == Bandwidth {
585585
if r.ContentLength > 0 {
586586
atomic.AddUint64(&test.testResult.data, uint64(r.ContentLength))
587587
}
@@ -602,4 +602,4 @@ func runHTTPLatencyServer() {
602602

603603
func runHTTPLatencyHandler(w http.ResponseWriter, r *http.Request) {
604604
runHTTPandHTTPSHandler(w, r, HTTP, Latency)
605-
}
605+
}

serverui.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (u *serverTui) emitLatencyResults(remote, proto string, avg, min, max, p50,
212212
func (u *serverTui) paint(seconds uint64) {
213213
tm.Clear(tm.ColorDefault, tm.ColorDefault)
214214
defer tm.Flush()
215-
printCenterText(0, 0, u.w, "Ethr " + gVersion, tm.ColorBlack, tm.ColorWhite)
215+
printCenterText(0, 0, u.w, "Ethr "+gVersion, tm.ColorBlack, tm.ColorWhite)
216216
printHLineText(u.resX, u.resY-1, u.resW, "Test Results")
217217
printHLineText(u.statX, u.statY-1, u.statW, "Statistics")
218218
printVLine(u.topVSplitX, u.topVSplitY, u.topVSplitH)

travis_build.sh

100644100755
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#!/bin/bash
2-
echo $TRAVIS_OS_NAME
32
echo "${TRAVIS_OS_NAME}"
43
echo "${TRAVIS_GO_VERSION}"
5-
if [ "${TRAVIS_OS_NAME}" = "linux" ] && [[ ${TRAVIS_GO_VERSION} == 1.11* ]]; then
4+
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
65
export GOOS=windows
76
export GOARCH=amd64
87
go build -o windows/ethr.exe -ldflags "-X main.gVersion=$TRAVIS_TAG"

0 commit comments

Comments
 (0)