aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2019-06-12 03:10:14 -0400
committerBen Morrison <ben@gbmor.dev>2019-06-12 03:10:14 -0400
commitfff90c740578399893711be7b1e73c79bb494d97 (patch)
tree13c83dfa0afaf87dd188d653946d715235e1568a
parentc2af13309490228b2e821b8f390afdd57018b3ab (diff)
downloadgetwtxt-fff90c740578399893711be7b1e73c79bb494d97.tar.gz
build flags and travis script changes
-rw-r--r--.travis.yml8
-rw-r--r--Makefile3
2 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 81a92e8..043fdca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,15 +16,13 @@ env:
before_script:
- sudo apt-get update
- sudo apt-get install -y libc6:i386 libstdc++6:i386
+ - cd svc/
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
script:
- - cd svc
- - go test -v --coverprofile=../c.out
+ - go test -v --coverprofile=c.out
+ - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
- cd ..
- make
-
-after_script:
- - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
diff --git a/Makefile b/Makefile
index 2151717..b27b392 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@ _INSTDIR=$(PREFIX)
BINDIR?=$(_INSTDIR)/getwtxt
VERSION?=$(shell git tag | grep ^v | sort -V | tail -n 1)
GOFLAGS?=-tags netgo \
- -ldflags '-X github.com/getwtxt/getwtxt/svc.Vers=${VERSION} -extldflags "-static"' \
- -buildmode pie
+ -ldflags '-X github.com/getwtxt/getwtxt/svc.Vers=${VERSION} -extldflags "-static"'
getwtxt: getwtxt.go go.mod go.sum
go build $(GOFLAGS) \