From 6b33db119a7af43cd711ede21843b4ed0c72f76e Mon Sep 17 00:00:00 2001
From: "Joe Richey joerichey@google.com" <joerichey@google.com>
Date: Wed, 19 Jul 2017 16:55:43 -0700
Subject: coveralls: Adding Travis CI integration

---
 Makefile | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e2f0bd9..24f37ee 100644
--- a/Makefile
+++ b/Makefile
@@ -110,11 +110,18 @@ update:
 	@govendor remove +unused
 
 # Format all the Go and C code
-.PHONY: format
+.PHONY: format format-check
 format:
 	@gofmt -l -s -w $(GO_FILES)
 	@clang-format -i -style=Google $(C_FILES)
 
+format-check:
+	@gofmt -s -d $(GO_FILES) \
+	| ./input_fail.py "Incorrectly formatted Go files. Run \"make format\"."
+	@clang-format -i -style=Google -output-replacements-xml $(C_FILES) \
+	| grep "<replacement " \
+	| ./input_fail.py "Incorrectly formatted C files. Run \"make format\"."
+
 # Run lint rules (skipping generated files)
 .PHONY: lint
 lint:
@@ -155,14 +162,12 @@ test-teardown:
 	sudo rmdir $(MOUNT)
 	rm -f $(IMAGE)
 
-##### Commands for Travis CI #####
+##### Travis CI Commands
+.PHONY: travis-setup travis-script
+travis-install: go-tools test-setup
+	go get -u github.com/mattn/goveralls
 
-.PHONY: check
-check: lint default test
+travis-script: lint format-check default
+	goveralls -service=travis-ci
 	@govendor list +missing +external +unused \
 	| ./input_fail.py "Incorrect vendored dependencies. Run \"make update\"."
-	@gofmt -s -d $(GO_FILES) \
-	| ./input_fail.py "Incorrectly formatted Go files. Run \"make format\"."
-	@clang-format -i -style=Google -output-replacements-xml $(C_FILES) \
-	| grep "<replacement " \
-	| ./input_fail.py "Incorrectly formatted C files. Run \"make format\"." 
-- 
cgit v1.3


From 16ec9949f831efd21c78d5f0cb589c40cbbeea33 Mon Sep 17 00:00:00 2001
From: "Joe Richey joerichey@google.com" <joerichey@google.com>
Date: Wed, 19 Jul 2017 18:10:18 -0700
Subject: Build system: no longer run make gen for make all

---
 CONTRIBUTING.md | 5 +++--
 Makefile        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 45c5487..1470fa4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -96,8 +96,9 @@ be older than v3.0.0. In that case, just get the build
 [directly from GitHub](https://github.com/google/protobuf/releases/latest).
 
 After installing everything, running `make all` will run all the commands
-mentioned above. As with `make test`, you can run the integration tests by
-either using `make all MOUNT=/path/to/my/filesystem` or using the
+mentioned above (except for `make gen` as different versions of protoc can
+rearrange things differently). As with `make test`, you can run the integration
+tests by either using `make all MOUNT=/path/to/my/filesystem` or using the
 `make test-setup` and `make test-teardown` commands.
 
 `make all` should always be run before submitting a pull request.
diff --git a/Makefile b/Makefile
index 24f37ee..4ebbe32 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ override GO_FLAGS += --ldflags '$(GO_LINK_FLAGS)'
 
 .PHONY: default all
 default: $(NAME)
-all: gen update format lint default test
+all: update format lint default test
 
 $(NAME): $(SRC_FILES)
 	go build $(GO_FLAGS) -o $(NAME) $(CMD_PKG)
-- 
cgit v1.3