Permalink
Browse files

cleanup

  • Loading branch information...
peter-edge committed Jan 20, 2016
1 parent cc058ea commit 36f054b45942f5c2aa0e2435813e6af0272478d3
Showing with 37 additions and 105 deletions.
  1. +0 −1 .dockerignore
  2. +0 −43 Dockerfile
  3. +5 −13 Makefile
  4. +4 −5 circle.yml
  5. +0 −1 pb/lionpb.go
  6. +1 −0 proto/protolion.go
  7. +26 −35 pb/lionpb.pb.go → proto/protolion.pb.go
  8. +1 −1 pb/lionpb.proto → proto/protolion.proto
  9. +0 −6 protoeasy.yaml

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -17,7 +17,7 @@ build: deps

lint: testdeps
go get -v github.com/golang/lint/golint
for file in $$(find . -name '*.go' | grep -v '\.pb.go$$' | grep -v 'testing/' | grep -v 'benchmark/'); do \
for file in $$(find . -name '*.go' | grep -v '\.pb\.go' | grep -v 'testing/'); do \
golint $$file | grep -v underscore; \
if [ -n "$$(golint $$file | grep -v underscore)" ]; then \
exit 1; \
@@ -34,22 +34,16 @@ errcheck: testdeps
pretest: lint vet errcheck

test: testdeps pretest
go test -test.v ./testing
go test -v ./testing

clean:
go clean -i ./...

proto:
go get -v go.pedge.io/protoeasy/cmd/protoeasy
go get -v go.pedge.io/pkg/cmd/strip-package-comments
protoeasy
strip-package-comments testing/testing.pb.go

docker-build:
docker build -t quay.io/pedge/lion .

docker-test: docker-build
docker run quay.io/pedge/lion make test
protoeasy --go --go-import-path go.pedge.io/lion .
find . -name *\.pb\*\.go | xargs strip-package-comments

.PHONY: \
all \
@@ -64,6 +58,4 @@ docker-test: docker-build
pretest \
test \
clean \
proto \
docker-build \
docker-test
proto
@@ -1,9 +1,8 @@
machine:
services:
- docker
dependencies:
override:
- docker build -t quay.io/pedge/lion .
- mkdir -p "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/lion"
- rsync -azC --delete ./ "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/lion/"
- make -C "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/lion" testdeps
test:
override:
- docker run quay.io/pedge/lion make test
- make -C "$(echo $GOPATH | cut -f 1 -d :)/src/go.pedge.io/lion" test

This file was deleted.

Oops, something went wrong.
@@ -0,0 +1 @@
package protolion // import "go.pedge.io/lion/proto"

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -4,7 +4,7 @@ import "google/protobuf/timestamp.proto";

package lion;

option go_package = "lionpb";
option go_package = "protolion";

// Level is a logging level.
enum Level {

This file was deleted.

Oops, something went wrong.

0 comments on commit 36f054b

Please sign in to comment.