Merge pull request cloudify-cosmo#26 from cloudify-cosmo/circle-update

fogelomer · fogelomer · commit 2b2e8e49521e · 2016-01-06T16:43:59.000+02:00
update circle.yml to deal with PR and add circle icon to README.md file
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Cloudify Script Plugin
 
+* Master [![Circle CI](https://circleci.com/gh/cloudify-cosmo/cloudify-script-plugin/tree/master.svg?style=shield)](https://circleci.com/gh/cloudify-cosmo/cloudify-script-plugin/tree/master)
 * Master Branch [![Build Status](https://travis-ci.org/cloudify-cosmo/cloudify-script-plugin.svg?branch=master)](https://travis-ci.org/cloudify-cosmo/cloudify-script-plugin)
 * PyPI [![PyPI](http://img.shields.io/pypi/dm/cloudify-script-plugin.svg)](http://img.shields.io/pypi/dm/cloudify-script-plugin.svg)
 * Version [![PypI](http://img.shields.io/pypi/v/cloudify-script-plugin.svg)](http://img.shields.io/pypi/v/cloudify-script-plugin.svg)
diff --git a/circle.yml b/circle.yml
@@ -2,8 +2,17 @@ machine:
   python:
     version: 2.7.9
 
-dependencies:
+checkout:
   post:
+    - >
+      if [ -n "$CI_PULL_REQUEST" ]; then
+        PR_ID=${CI_PULL_REQUEST##*/}
+        git fetch origin +refs/pull/$PR_ID/merge:
+        git checkout -qf FETCH_HEAD
+      fi
+
+dependencies:
+  pre:
     - pyenv local 2.7.9 2.6.8
   override:
     - pip install tox
