Update travis to use Makefile

Signed-off-by: Javier Romero <[email protected]>
buildpacks · Oct 9, 2019 · 93f8b9b · 93f8b9b
1 parent d2cad01
commit 93f8b9b
Show file tree

Hide file tree

Showing 58 changed files with 1,561 additions and 686 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,17 @@
-sudo: required
-services:
-- docker
-install:
-- set -e
+language: go
+go: 1.12.x
+
+env:
+  global:
+    - GO111MODULE=on
+
 jobs:
   include:
-  - stage: unit test
-    language: go
-    go:
-    - 1.11.x
-    env:
-    - GO111MODULE=on
-    go_import_path: github.com/buildpack/lifecycle
-    script: |
-      test -z "$(bin/format | tee >(cat >&2))"
-      go test -v -parallel=1 -p=1 -count=1 ./...
+    - os: linux
+      script: 
+        - docker info
+        - make
+
+branches:
+  only:
+    - master
diff --git a/Makefile b/Makefile
@@ -1,18 +1,23 @@
 # Go parameters
 GOCMD?=go
 GOTEST=$(GOCMD) test -mod=vendor
+PACKAGE_BASE=github.com/buildpack/imgutil
+PACKAGES:=$(shell $(GOCMD) list -mod=vendor ./... | grep -v /testdata/)
+SRC:=$(shell find . -type f -name '*.go' -not -path "*/vendor/*")
 
 all: test
 
-imports:
-	$(GOCMD) install -mod=vendor golang.org/x/tools/cmd/goimports
-	test -z $$(goimports -l -w -local github.com/buildpack/imgutil $$(find . -type f -name '*.go' -not -path "./vendor/*"))
+install-goimports:
+	@echo "> Installing goimports..."
+	cd tools; $(GOCMD) install -mod=vendor golang.org/x/tools/cmd/goimports
 
-format:
-	test -z $$($(GOCMD) fmt ./...)
+format: install-goimports
+	@echo "> Formating code..."
+	@goimports -l -w -local ${PACKAGE_BASE} ${SRC}
 
 vet:
-	$(GOCMD) vet $$($(GOCMD) list ./... | grep -v /testdata/)
+	@echo "> Vetting code..."
+	@$(GOCMD) vet -mod=vendor ${PACKAGES}
 
-test: format imports vet
+test: format vet
 	$(GOTEST) -parallel=1 -count=1 -v ./...
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Helpful utilities for working with images
 To format:
 
 ```bash
-$ make format imports
+$ make format
 ```
 
 To run tests:

diff --git a/go.mod b/go.mod
@@ -22,7 +22,6 @@ require (
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/sys v0.0.0-20190416152802-12500544f89f // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	golang.org/x/tools v0.0.0-20190624190245-7f2218787638
 	google.golang.org/grpc v1.20.0 // indirect
 	gotest.tools v2.2.0+incompatible // indirect
 )
diff --git a/go.sum b/go.sum
@@ -79,8 +79,6 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZe
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190624190245-7f2218787638 h1:uIfBkD8gLczr4XDgYpt/qJYds2YJwZRNw4zs7wSnNhk=
-golang.org/x/tools v0.0.0-20190624190245-7f2218787638/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

diff --git a/tools/go.mod b/tools/go.mod
@@ -0,0 +1,5 @@
+module github.com/buildpack/pack/tools
+
+go 1.13
+
+require golang.org/x/tools v0.0.0-20190929041059-e7abfedfabcf
diff --git a/tools/go.sum b/tools/go.sum
@@ -0,0 +1,8 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190929041059-e7abfedfabcf h1:NvypsVlesF+lEDKVK5RNkww4fzArJXChZxNin79j05M=
+golang.org/x/tools v0.0.0-20190929041059-e7abfedfabcf/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/vendor/golang.org/x/tools/AUTHORS → tools/vendor/golang.org/x/tools/AUTHORS b/vendor/golang.org/x/tools/AUTHORS → tools/vendor/golang.org/x/tools/AUTHORS
diff --git a/vendor/golang.org/x/tools/CONTRIBUTORS → tools/vendor/golang.org/x/tools/CONTRIBUTORS b/vendor/golang.org/x/tools/CONTRIBUTORS → tools/vendor/golang.org/x/tools/CONTRIBUTORS
diff --git a/vendor/golang.org/x/tools/LICENSE → tools/vendor/golang.org/x/tools/LICENSE b/vendor/golang.org/x/tools/LICENSE → tools/vendor/golang.org/x/tools/LICENSE
diff --git a/vendor/golang.org/x/tools/PATENTS → tools/vendor/golang.org/x/tools/PATENTS b/vendor/golang.org/x/tools/PATENTS → tools/vendor/golang.org/x/tools/PATENTS
diff --git a/...r/golang.org/x/tools/cmd/goimports/doc.go → ...r/golang.org/x/tools/cmd/goimports/doc.go b/...r/golang.org/x/tools/cmd/goimports/doc.go → ...r/golang.org/x/tools/cmd/goimports/doc.go
diff --git a/...ng.org/x/tools/cmd/goimports/goimports.go → ...ng.org/x/tools/cmd/goimports/goimports.go b/...ng.org/x/tools/cmd/goimports/goimports.go → ...ng.org/x/tools/cmd/goimports/goimports.go
diff --git a/...org/x/tools/cmd/goimports/goimports_gc.go → ...org/x/tools/cmd/goimports/goimports_gc.go b/...org/x/tools/cmd/goimports/goimports_gc.go → ...org/x/tools/cmd/goimports/goimports_gc.go
diff --git a/...x/tools/cmd/goimports/goimports_not_gc.go → ...x/tools/cmd/goimports/goimports_not_gc.go b/...x/tools/cmd/goimports/goimports_not_gc.go → ...x/tools/cmd/goimports/goimports_not_gc.go
diff --git a/...g.org/x/tools/go/ast/astutil/enclosing.go → ...g.org/x/tools/go/ast/astutil/enclosing.go b/...g.org/x/tools/go/ast/astutil/enclosing.go → ...g.org/x/tools/go/ast/astutil/enclosing.go
diff --git a/...ang.org/x/tools/go/ast/astutil/imports.go → ...ang.org/x/tools/go/ast/astutil/imports.go b/...ang.org/x/tools/go/ast/astutil/imports.go → ...ang.org/x/tools/go/ast/astutil/imports.go
diff --git a/...ang.org/x/tools/go/ast/astutil/rewrite.go → ...ang.org/x/tools/go/ast/astutil/rewrite.go b/...ang.org/x/tools/go/ast/astutil/rewrite.go → ...ang.org/x/tools/go/ast/astutil/rewrite.go
diff --git a/...golang.org/x/tools/go/ast/astutil/util.go → ...golang.org/x/tools/go/ast/astutil/util.go b/...golang.org/x/tools/go/ast/astutil/util.go → ...golang.org/x/tools/go/ast/astutil/util.go
diff --git a/...g/x/tools/go/gcexportdata/gcexportdata.go → ...g/x/tools/go/gcexportdata/gcexportdata.go b/...g/x/tools/go/gcexportdata/gcexportdata.go → ...g/x/tools/go/gcexportdata/gcexportdata.go
diff --git a/...g.org/x/tools/go/gcexportdata/importer.go → ...g.org/x/tools/go/gcexportdata/importer.go b/...g.org/x/tools/go/gcexportdata/importer.go → ...g.org/x/tools/go/gcexportdata/importer.go
diff --git a/...olang.org/x/tools/go/gcexportdata/main.go → ...olang.org/x/tools/go/gcexportdata/main.go b/...olang.org/x/tools/go/gcexportdata/main.go → ...olang.org/x/tools/go/gcexportdata/main.go
diff --git a/...x/tools/go/internal/gcimporter/bexport.go → ...x/tools/go/internal/gcimporter/bexport.go b/...x/tools/go/internal/gcimporter/bexport.go → ...x/tools/go/internal/gcimporter/bexport.go
diff --git a/...x/tools/go/internal/gcimporter/bimport.go → ...x/tools/go/internal/gcimporter/bimport.go b/...x/tools/go/internal/gcimporter/bimport.go → ...x/tools/go/internal/gcimporter/bimport.go
diff --git a/...ools/go/internal/gcimporter/exportdata.go → ...ools/go/internal/gcimporter/exportdata.go b/...ools/go/internal/gcimporter/exportdata.go → ...ools/go/internal/gcimporter/exportdata.go
diff --git a/...ools/go/internal/gcimporter/gcimporter.go → ...ools/go/internal/gcimporter/gcimporter.go b/...ools/go/internal/gcimporter/gcimporter.go → ...ools/go/internal/gcimporter/gcimporter.go
diff --git a/...x/tools/go/internal/gcimporter/iexport.go → ...x/tools/go/internal/gcimporter/iexport.go b/...x/tools/go/internal/gcimporter/iexport.go → ...x/tools/go/internal/gcimporter/iexport.go
diff --git a/...x/tools/go/internal/gcimporter/iimport.go → ...x/tools/go/internal/gcimporter/iimport.go b/...x/tools/go/internal/gcimporter/iimport.go → ...x/tools/go/internal/gcimporter/iimport.go
diff --git a/.../go/internal/gcimporter/newInterface10.go → .../go/internal/gcimporter/newInterface10.go b/.../go/internal/gcimporter/newInterface10.go → .../go/internal/gcimporter/newInterface10.go
diff --git a/.../go/internal/gcimporter/newInterface11.go → .../go/internal/gcimporter/newInterface11.go b/.../go/internal/gcimporter/newInterface11.go → .../go/internal/gcimporter/newInterface11.go
diff --git a/...tools/go/internal/packagesdriver/sizes.go → ...tools/go/internal/packagesdriver/sizes.go b/...tools/go/internal/packagesdriver/sizes.go → ...tools/go/internal/packagesdriver/sizes.go
diff --git a/vendor/golang.org/x/tools/go/packages/doc.go → ...dor/golang.org/x/tools/go/packages/doc.go b/vendor/golang.org/x/tools/go/packages/doc.go → ...dor/golang.org/x/tools/go/packages/doc.go
diff --git a/...olang.org/x/tools/go/packages/external.go → ...olang.org/x/tools/go/packages/external.go b/...olang.org/x/tools/go/packages/external.go → ...olang.org/x/tools/go/packages/external.go