Merge pull request #66 from stelligent/develop

Migrate to CircleCI

Makefile

@@ -7,36 +7,44 @@ BRANCH := $(or $(TRAVIS_BRANCH), $(shell git rev-parse --abbrev-ref HEAD))
 IS_MASTER := $(filter master, $(BRANCH))
 VERSION := $(shell cat VERSION)$(if $(IS_MASTER),,-$(BRANCH))
 ARCH := $(shell go env GOARCH)
-BUILD_FILES = $(foreach os, $(TARGET_OS), .release/$(PACKAGE)-$(os)-$(ARCH))
+BUILD_DIR = $(if $(CIRCLE_ARTIFACTS),$(CIRCLE_ARTIFACTS),.release)
+BUILD_FILES = $(foreach os, $(TARGET_OS), $(BUILD_DIR)/$(PACKAGE)-$(os)-$(ARCH))
 UPLOAD_FILES = $(foreach os, $(TARGET_OS), $(PACKAGE)-$(os)-$(ARCH))
-GOLDFLAGS = "-X common.version=$(VERSION)"
+GOLDFLAGS = "-X main.version=$(VERSION)"
 TAG_VERSION = v$(VERSION)
 
 default: build
 
-setup:
+deps:
 	@echo "=== preparing $(VERSION) from $(BRANCH) ==="
-	mkdir -p .release
-	go get -u "github.com/golang/lint/golint"
-	go get -u "github.com/aktau/github-release"
-	go get -u "github.com/jteeuwen/go-bindata/..."
+	go get "github.com/jteeuwen/go-bindata/..."
+	go get "github.com/golang/lint/golint"
+	go get "github.com/jstemmer/go-junit-report"
+	go get "github.com/aktau/github-release"
 	go get -t -d -v ./...
 	go generate ./...
 
-lint: setup
+lint:
 	@echo "=== linting ==="
 	go vet ./...
 	golint -set_exit_status ./...
 
 test: lint
 	@echo "=== testing ==="
+ifneq ($(CIRCLE_TEST_REPORTS),)
+	mkdir -p $(CIRCLE_TEST_REPORTS)/unit
+	go test -v -cover ./... | go-junit-report > $(CIRCLE_TEST_REPORTS)/unit/report.xml
+else
 	go test -cover ./...
+endif
+
 
-build: test $(BUILD_FILES)
+build: $(BUILD_FILES)
 
-$(BUILD_FILES): setup
+$(BUILD_FILES):
 	@echo "=== building $(VERSION) - $@ ==="
-	GOOS=$(word 2,$(subst -, ,$@)) GOARCH=$(word 3,$(subst -, ,$@)) go build -ldflags=$(GOLDFLAGS) -o '$@'
+	mkdir -p $(BUILD_DIR)
+	GOOS=$(word 2,$(subst -, ,$(notdir $@))) GOARCH=$(word 3,$(subst -, ,$(notdir $@))) go build -ldflags=$(GOLDFLAGS) -o '$@'
 
 release-clean:
 ifeq ($(IS_MASTER),)
@@ -54,7 +62,7 @@ release-create: release-clean
 
 $(TARGET_OS): release-create
 	@echo "=== uploading $@ ==="
-	github-release upload -u $(ORG) -r $(PACKAGE) -t $(TAG_VERSION) -n "$(PACKAGE)-$@-$(ARCH)" -f ".release/$(PACKAGE)-$@-$(ARCH)"
+	github-release upload -u $(ORG) -r $(PACKAGE) -t $(TAG_VERSION) -n "$(PACKAGE)-$@-$(ARCH)" -f "$(BUILD_DIR)/$(PACKAGE)-$@-$(ARCH)"
 
 dev-release: $(TARGET_OS)
 
@@ -69,6 +77,6 @@ endif
 
 clean:
 	@echo "=== cleaning ==="
-	rm -rf .release
+	rm -rf $(BUILD_DIR)
 
-.PHONY: default lint test build setup clean release-clean release-create dev-release release $(UPLOAD_FILES) $(TARGET_OS)
+.PHONY: default lint test build deps clean release-clean release-create dev-release release $(UPLOAD_FILES) $(TARGET_OS)

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/stelligent/mu.svg?branch=develop)](https://travis-ci.org/stelligent/mu)
+[![Build Status](https://circleci.com/gh/stelligent/mu.svg?style=svg)](https://circleci.com/gh/stelligent/mu)
 
 # Why?
 Amazon ECS (EC2 Container Service) provides an excellent platform for deploying microservices as containers.  The challenge however is that there is a significant learning curve for microservice developers to deploy their applications in an efficient manner.  Specifically, they must learn to use CloudFormation to orchestrate the management of ECS, ECR, EC2, ELB, VPC, and IAM resources.  Additionally, tools like CodeBuild and CodePipeline must be mastered to create a continuous delivery pipeline for their microservices.

VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

circle.yml

@@ -0,0 +1,42 @@
+## Don't build when new release tags are pushed
+general:
+  branches:
+    ignore:
+      - /^v[0-9]/
+
+## Run 'make deps' for resolving dependencies
+dependencies:
+  override:
+    - make deps
+
+## Run 'make' for compile
+compile:
+  override:
+    - make
+
+## Run 'make test' to test
+test:
+  override:
+    - make test
+
+
+## In order for deploy to work, you need an environment variable set in CircleCI named "GITHUB_TOKEN" that contains
+##  a token created from https://github.com/settings/tokens
+##
+## Also, an read/write SSH key needs to be created and private key added to circle ci
+##    as per https://circleci.com/docs/adding-read-write-deployment-key/
+##
+## Suggest creating a machine user for the token and ssh key to limit access
+##
+deployment:
+  ## Create 'pre-release' from 'develop' branch
+  pre-release:
+    branch: develop
+    commands:
+      - make dev-release
+
+  ## Create 'release' from 'master' branch
+  release:
+    branch: master
+    commands:
+      - make release

common/context.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path"
 	"time"
+	"path/filepath"
 )
 
 var version string
@@ -33,8 +34,13 @@ func NewContext() *Context {
 
 // InitializeFromFile loads config from file
 func (ctx *Context) InitializeFromFile(muFile string) error {
+	absMuFile,err := filepath.Abs(muFile)
+	if err != nil {
+		return err
+	}
+
 	// load yaml config
-	yamlFile, err := os.Open(muFile)
+	yamlFile, err := os.Open(absMuFile)
 	if err != nil {
 		return err
 	}
@@ -43,10 +49,10 @@ func (ctx *Context) InitializeFromFile(muFile string) error {
 	}()
 
 	// set the basedir
-	ctx.Config.Basedir = path.Dir(muFile)
+	ctx.Config.Basedir = path.Dir(absMuFile)
 	ctx.Repo.Name = path.Base(ctx.Config.Basedir)
 	ctx.Repo.Revision = time.Now().Format("20060102150405")
-	gitRevision, err := findGitRevision(muFile)
+	gitRevision, err := findGitRevision(absMuFile)
 	if err == nil {
 		ctx.Repo.Revision = gitRevision
 	}

common/git.go

@@ -26,6 +26,7 @@ func findGitRevision(file string) (string, error) {
 }
 
 func findGitDirectory(fromFile string) (string, error) {
+	log.Debugf("Searching for git directory in %s",fromFile)
 	fi, err := os.Stat(fromFile)
 	if err != nil {
 		return "", err

examples/mu.yml

@@ -0,0 +1,8 @@
+---
+region: us-west-2
+
+environments:
+  - name: sample-dev
+    cluster:
+      desiredCapacity: 1
+      maxSize: 2