Skip to content

Commit

Permalink
Merge pull request #21 from digitalocean/add-build-process
Browse files Browse the repository at this point in the history
Standardize repo layout to align with the other Prometheus projects.
  • Loading branch information
cagedmantis authored Dec 21, 2016
2 parents 09b2991 + 60eb354 commit 4e1717c
Show file tree
Hide file tree
Showing 304 changed files with 127,868 additions and 22 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
language: go
dist: trusty

language: go

go:
- 1.7

install:
- go get github.com/Sirupsen/logrus
- go get github.com/prometheus/client_golang/prometheus
- go get github.com/prometheus/common/log
- go get github.com/prometheus/common/version

script:
- go test ./...
- make
17 changes: 3 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ BIN_DIR ?= $(shell pwd)
DOCKER_IMAGE_NAME ?= bind-exporter
DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD))

ifdef DEBUG
bindata_flags = -debug
endif


all: format build test

Expand Down Expand Up @@ -55,16 +51,9 @@ docker:
@echo ">> building docker image"
@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .

assets:
@echo ">> writing assets"
-@$(GO) get -u github.com/jteeuwen/go-bindata/...
@go-bindata $(bindata_flags) -pkg ui -o ui/bindata.go ui/...
@go-bindata $(bindata_flags) -pkg deftmpl -o template/internal/deftmpl/bindata.go template/default.tmpl

promu:
@GOOS=$(shell uname -s | tr A-Z a-z) \
GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
$(GO) get -u github.com/prometheus/promu

GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
$(GO) get -u github.com/prometheus/promu

.PHONY: all style format build test vet assets tarball docker promu
.PHONY: all style format build test vet tarball docker promu
55 changes: 55 additions & 0 deletions vendor/github.com/Sirupsen/logrus/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions vendor/github.com/Sirupsen/logrus/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4e1717c

Please sign in to comment.