From 261f196c96e36b4d676396f552bde0a4d29ceed2 Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Sat, 13 Jan 2018 12:25:42 +0000
Subject: [PATCH] Switch to circleci v2

---
 .circleci/config.yml | 27 +++++++++++++++++++++++++++
 circle.yml           | 33 ---------------------------------
 2 files changed, 27 insertions(+), 33 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..f581367
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,27 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.9
+
+    working_directory: /go/src/github.com/jamesnetherton/homehub-cli
+
+    steps:
+      - checkout
+
+      - setup_remote_docker:
+          version: 17.11.0-ce
+
+      - run:
+          command: |
+            make test
+
+      - deploy:
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "release" ]; then
+              make release
+              docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
+              docker push jamesnetherton/homehub-cli:latest
+              docker push jamesnetherton/homehub-cli:$(cat /go/src/github.com/jamesnetherton/homehub-cli/version.txt)
+              docker logout
+            fi
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 2026f3a..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-machine:
-  services:
-    - docker
-  environment:
-    GODIST: "go1.9.linux-amd64.tar.gz"
-    PATH: "/usr/local/go/bin:/usr/local/go_workspace/bin:~/.go_workspace/bin:${PATH}"
-    GOPATH: "${HOME}/.go_workspace:/usr/local/go_workspace:${HOME}/.go_project"
-    PROJECT: "${HOME}/.go_project/src/github.com/jamesnetherton/homehub-cli"
-  post:
-    - mkdir -p download
-    - mkdir -p ${HOME}/.go_project/src/github.com/jamesnetherton/
-    - cd ${HOME}/.go_project/src/github.com/jamesnetherton/ && ln -s ${HOME}/homehub-cli homehub-cli
-    - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
-    - sudo rm -rf /usr/local/go
-    - sudo tar -C /usr/local -xzf download/$GODIST
-
-dependencies:
-  cache_directories:
-    - ~/download
-
-test:
-  override:
-    - cd ${PROJECT} && make test
-
-deployment:
-  release:
-    branch: release
-    commands:
-      - cd ${PROJECT} && make release
-      - docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
-      - docker push jamesnetherton/homehub-cli:latest
-      - docker push jamesnetherton/homehub-cli:$(cat ${PROJECT}/version.txt)
-      - docker logout