Skip to content

Commit

Permalink
Merge 3bbb395 into bf2d937
Browse files Browse the repository at this point in the history
  • Loading branch information
ColinSullivan1 committed Feb 21, 2018
2 parents bf2d937 + 3bbb395 commit 42f0644
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 42 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ _testmain.go
*.exe
*.test
*.prof
travis_wait*.log
3 changes: 2 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
project_name: prometheus-nats-exporter

release:
prerelease: true
github:
owner: nats-io
name: prometheus-nats-exporter

name_template: 'Release {{.Tag}}'

builds:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ For further information, refer to the [walkthough](walkthrough/README.md) of mon

[License-Url]: http://opensource.org/licenses/MIT
[License-Image]: https://img.shields.io/badge/License-MIT-blue.svg
[Build-Status-Url]: http://travis-ci.com/nats-io/prometheus-nats-exporter
[Build-Status-Image]: https://travis-ci.com/nats-io/prometheus-nats-exporter.svg?token=bQqsBkZfycgqwrXTwekn&branch=master
[Build-Status-Url]: http://travis-ci.org/nats-io/prometheus-nats-exporter
[Build-Status-Image]: https://travis-ci.org/nats-io/nats-streaming-server.svg?branch=master
[Coverage-Url]: https://coveralls.io/r/nats-io/prometheus-nats-exporter?branch=master
[Coverage-image]: https://coveralls.io/repos/github/nats-io/prometheus-nats-exporter/badge.svg?branch=master
18 changes: 9 additions & 9 deletions scripts/cov.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#!/bin/bash -e
# Run from directory above via ./scripts/cov.sh

rm -rf ./cov
mkdir cov
go test -v -covermode=atomic -coverprofile=./cov/collector.out ./collector
go test -v -covermode=atomic -coverprofile=./cov/exporter.out ./exporter
gocovmerge ./cov/*.out > acc.out
rm -rf ./cov
rm -rf /tmp/cov
mkdir -p /tmp/cov
go test -v -covermode=atomic -coverprofile=/tmp/cov/collector.out ./collector
go test -v -covermode=atomic -coverprofile=/tmp/cov/exporter.out ./exporter
gocovmerge /tmp/cov/*.out > /tmp/acc.out
rm -rf /tmp/cov

# If we have an arg, assume travis run and push to coveralls. Otherwise launch browser results
if [[ -n $1 ]]; then
$HOME/gopath/bin/goveralls -coverprofile=acc.out -service travis-ci
rm -rf ./acc.out
$HOME/gopath/bin/goveralls -coverprofile=/tmp/acc.out -service travis-ci
rm -rf /tmp/acc.out
else
go tool cover -html=acc.out
go tool cover -html=/tmp/acc.out
fi
30 changes: 0 additions & 30 deletions scripts/cross_compile.sh

This file was deleted.

0 comments on commit 42f0644

Please sign in to comment.