Merge pull request #26 from zencoder/circle_v2

CircleCI v2

Author: thomshutt

.circleci/config.yml

@@ -0,0 +1,50 @@
+---
+version: 2
+executorType: docker
+containerInfo:
+  - image: library/golang
+    environment:
+      AWS_ACCESS_KEY_ID: 1
+      AWS_SECRET_ACCESS_KEY: 1
+      GLIDE_VERSION: 0.12.3
+jobs:
+  build:
+    workdir: "/go/src/github.com/zencoder/go-remote-config"
+    steps:
+      - checkout
+      - run:
+          name: Install Glide
+          command: |
+            set -eux
+            curl -sSLfO https://github.com/Masterminds/glide/releases/download/v${GLIDE_VERSION}/glide-v${GLIDE_VERSION}-linux-amd64.tar.gz
+            mkdir glide
+            tar -xzf glide-v${GLIDE_VERSION}-linux-amd64.tar.gz -C ./glide
+            cp ./glide/linux-amd64/glide /usr/local/bin/glide
+            rm -r glide glide-v${GLIDE_VERSION}-linux-amd64.tar.gz
+      - restore_cache:
+          key: glide-{{ checksum "glide.lock" }}
+      - run:
+          name: Download vendored Go dependencies
+          command: glide install
+      - save_cache:
+          key: glide-{{ checksum "glide.lock" }}
+          paths:
+            - vendor
+      - run:
+          name: Install required tooling
+          command: |
+            go get golang.org/x/tools/cmd/cover
+            go get github.com/mattn/goveralls
+            go get github.com/modocache/gover
+      - run:
+          name: Run unit tests
+          command: |
+            make test
+      - run:
+          name: Collect coverage reports
+          command: |
+            make cover
+      - run:
+          name: Submit coverage to coveralls.io
+          command: |
+            make coveralls

Makefile

@@ -1,27 +1,29 @@
-GO15VENDOREXPERIMENT := 1
-
 COVERAGEDIR = coverage
 ifdef CIRCLE_ARTIFACTS
   COVERAGEDIR = $(CIRCLE_ARTIFACTS)
 endif
 
-all: build test cover
+ifdef VERBOSE
+V = -v
+else
+.SILENT:
+endif
+
 install-deps:
-	glide install	
+	glide install
 build:
-	if [ ! -d bin ]; then mkdir bin; fi
-	go build -v -o bin/go-remote-config
+	mkdir -p bin
+	go build $(V) -o bin/go-remote-config
 fmt:
 	go fmt ./...
 
 test: export AWS_ACCESS_KEY_ID := 1
 test: export AWS_SECRET_ACCESS_KEY := 1
 test:
-	if [ ! -d coverage ]; then mkdir coverage; fi
-	go test -v ./ -race -cover -coverprofile=$(COVERAGEDIR)/remoteconfig.coverprofile
+	mkdir -p coverage
+	go test $(V) ./ -race -cover -coverprofile=$(COVERAGEDIR)/remoteconfig.coverprofile
 cover:
 	go tool cover -html=$(COVERAGEDIR)/remoteconfig.coverprofile -o $(COVERAGEDIR)/remoteconfig.html
-tc: test cover
 coveralls:
 	gover $(COVERAGEDIR) $(COVERAGEDIR)/coveralls.coverprofile
 	goveralls -coverprofile=$(COVERAGEDIR)/coveralls.coverprofile -service=circle-ci -repotoken=$(COVERALLS_TOKEN)