Merge branch 'develop' into goreleaser

secrethub · Mar 11, 2019 · 7d55bb2 · 7d55bb2
2 parents e4173ea + 6ea1065
commit 7d55bb2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,21 @@
+version: 2
+build_common: &build
+  steps:
+    - checkout
+    - run: make build
+jobs:
+  build_golang_1.11:
+    <<: *build
+    docker:
+      - image: circleci/golang:1.11
+  build_golang_1.12:
+    <<: *build
+    docker:
+      - image: circleci/golang:1.12
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build_golang_1.11
+      - build_golang_1.12
diff --git a/Makefile b/Makefile
@@ -0,0 +1,2 @@
+build:
+	go build ./cmd/secrethub-proxy