From a8245efc3350ed00d8f7c6b51032568705233311 Mon Sep 17 00:00:00 2001 From: Grant Heffernan Date: Wed, 28 Oct 2015 07:33:37 -0400 Subject: [PATCH 1/2] deploy master to dev --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index 3b287f46..d5df506a 100644 --- a/circle.yml +++ b/circle.yml @@ -17,3 +17,10 @@ deployment: - 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] + dev: + branch: master + 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[dev] From a9fe638dfb431521f887e0f70bbdcfea1ebaed90 Mon Sep 17 00:00:00 2001 From: Grant Heffernan Date: Wed, 28 Oct 2015 07:35:17 -0400 Subject: [PATCH 2/2] acceptance tests run against dev --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d5df506a..0fd2eaf7 100644 --- a/circle.yml +++ b/circle.yml @@ -21,6 +21,6 @@ deployment: branch: master commands: - git clone git@github.com:pelias/acceptance-tests && cd acceptance-tests && npm install - - cd acceptance-tests && npm test -- -e prod + - cd acceptance-tests && npm test -- -e dev - git clone git@github.com:mapzen/pelias-deploy.git && cd pelias-deploy && bundle install - cd pelias-deploy && bundle exec rake deploy:api[dev]