From a299106a2c550df9196313b271ceb20b119c132c Mon Sep 17 00:00:00 2001
From: Grant Heffernan <heffergm@gmail.com>
Date: Tue, 29 Sep 2015 17:39:57 -0400
Subject: [PATCH 1/4] circle.yml: automate api deployments for prod/prod_build

---
 circle.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 circle.yml

diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..a46b8e50
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,19 @@
+machine:
+  ruby:
+    version: 2.1.2
+  node:
+    version: 0.12.2
+
+dependencies:
+  pre:
+    - echo "{\"mapzen\":{\"api_key\":{\"pelias.mapzen.com\":\"$SEARCH_API_KEY\",\"pelias.mapzen.com\":\"$PELIAS_API_KEY\"}}}" >~/pelias.json
+
+deployment:
+  prod:
+    branch: production
+    commands:
+      - git clone git@github.com:pelias/acceptance-tests && cd acceptance-tests && npm install
+      - cd acceptance-tests && npm test -- -e prod
+      - git clone git@github.com:mapzen/pelias-deploy.git && cd pelias-deploy && bundle install
+      - cd pelias-deploy && bundle exec rake deploy:api[prod]
+      - cd pelias-deploy && bundle exec rake deploy:api[prod_build]

From f5d823ddc23cf3a82db5db871d8f2cd63e47c4d3 Mon Sep 17 00:00:00 2001
From: Grant Heffernan <heffergm@gmail.com>
Date: Tue, 13 Oct 2015 09:29:37 -0400
Subject: [PATCH 2/4] fix circle.yml typo

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index a46b8e50..3b287f46 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,7 @@ machine:
 
 dependencies:
   pre:
-    - echo "{\"mapzen\":{\"api_key\":{\"pelias.mapzen.com\":\"$SEARCH_API_KEY\",\"pelias.mapzen.com\":\"$PELIAS_API_KEY\"}}}" >~/pelias.json
+    - echo "{\"mapzen\":{\"api_key\":{\"search.mapzen.com\":\"$SEARCH_API_KEY\",\"pelias.mapzen.com\":\"$PELIAS_API_KEY\"}}}" >~/pelias.json
 
 deployment:
   prod:

From 84bae8226b231e5cd6f61c26f7672da6826886a0 Mon Sep 17 00:00:00 2001
From: Grant Heffernan <heffergm@gmail.com>
Date: Thu, 15 Oct 2015 09:53:20 -0400
Subject: [PATCH 3/4] should only need search api key

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 3b287f46..4be6b301 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,7 @@ machine:
 
 dependencies:
   pre:
-    - echo "{\"mapzen\":{\"api_key\":{\"search.mapzen.com\":\"$SEARCH_API_KEY\",\"pelias.mapzen.com\":\"$PELIAS_API_KEY\"}}}" >~/pelias.json
+    - echo "{\"mapzen\":{\"api_key\":{\"search.mapzen.com\":\"$SEARCH_API_KEY\"}}}" >~/pelias.json
 
 deployment:
   prod:

From 82509890254d02f1a33b90fad6d53723e93bfb20 Mon Sep 17 00:00:00 2001
From: Grant Heffernan <heffergm@gmail.com>
Date: Wed, 28 Oct 2015 07:26:36 -0400
Subject: [PATCH 4/4] Revert "should only need search api key"

This reverts commit 84bae8226b231e5cd6f61c26f7672da6826886a0.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 4be6b301..3b287f46 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,7 @@ machine:
 
 dependencies:
   pre:
-    - echo "{\"mapzen\":{\"api_key\":{\"search.mapzen.com\":\"$SEARCH_API_KEY\"}}}" >~/pelias.json
+    - echo "{\"mapzen\":{\"api_key\":{\"search.mapzen.com\":\"$SEARCH_API_KEY\",\"pelias.mapzen.com\":\"$PELIAS_API_KEY\"}}}" >~/pelias.json
 
 deployment:
   prod: