From fff90c740578399893711be7b1e73c79bb494d97 Mon Sep 17 00:00:00 2001 From: Ben Morrison Date: Wed, 12 Jun 2019 03:10:14 -0400 Subject: build flags and travis script changes --- .travis.yml | 8 +++----- Makefile | 3 +-- 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) \ -- cgit 1.4.1-2-gfad0