Testing travis (#4)

* Travis
markphelps · Mar 25, 2018 · 5541f70 · 5541f70
1 parent dae31b7
commit 5541f70
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,6 @@
+language: go
+go: "1.10"
+
+install: true
+before_script: make setup
+script: make ci
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ setup: ## Install all the build and lint dependencies
 	go get -u github.com/golang/dep/cmd/dep
 	go get -u github.com/alecthomas/gometalinter
 	go get -u golang.org/x/tools/cmd/cover
-	gometalinter --install --update
+	gometalinter --install
 
 .PHONY: dep
 dep: ## Install all import dependencies

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Optional
 
+[![Build Status](https://travis-ci.org/markphelps/optional.svg?branch=master)](https://travis-ci.org/markphelps/optional)
 [![Release](https://img.shields.io/github/release/markphelps/optional.svg?style=flat-square)](https://github.com/markphelps/optional/releases/latest)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
 [![Go Doc](https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square)](http://godoc.org/github.com/markphelps/optional)

diff --git a/cmd/optional/main.go b/cmd/optional/main.go
@@ -126,8 +126,8 @@ const tmpl = `// Code generated by go generate
 package {{ .PackageName }}
 
 import (
-    "encoding/json"
-    "errors"
+	"encoding/json"
+	"errors"
 )
 
 // {{ .OutputName }} is an optional {{ .TypeName }}

diff --git a/cmd/optional/testdata/optional_bar.go b/cmd/optional/testdata/optional_bar.go
diff --git a/cmd/optional/testdata/optional_foo.go b/cmd/optional/testdata/optional_foo.go
diff --git a/cmd/optional/testdata/string.go b/cmd/optional/testdata/string.go
diff --git a/example_test.go b/example_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/markphelps/optional"
 )
 
-func Example_Get() {
+func Example_get() {
 	values := []optional.String{
 		optional.NewString("foo"),
 		optional.NewString(""),
@@ -30,7 +30,7 @@ func Example_Get() {
 	// bar
 }
 
-func Example_OrElse() {
+func Example_orElse() {
 	values := []optional.String{
 		optional.NewString("foo"),
 		optional.NewString(""),
@@ -49,7 +49,7 @@ func Example_OrElse() {
 	// not present
 }
 
-func Example_If() {
+func Example_if() {
 	values := []optional.String{
 		optional.NewString("foo"),
 		optional.NewString(""),
@@ -69,7 +69,7 @@ func Example_If() {
 	// present
 }
 
-func Example_MarshalJSON() {
+func Example_marshalJSON() {
 	var values = []struct {
 		Field optional.String `json:"field,omitempty"`
 	}{
@@ -96,7 +96,7 @@ func Example_MarshalJSON() {
 	// {"field":"bar"}
 }
 
-func Example_UnmarshalJSON() {
+func Example_unmarshalJSON() {
 	var values = []string{
 		`{"field":"foo"}`,
 		`{"field":""}`,