Fix in bitbucket-pipelines.yml for heroku deployment

.editorconfig

@@ -0,0 +1,29 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# 4 space indentation
+[*.yml]
+indent_style = space
+indent_size = 2
+
+# Indentation override for all JS under lib directory
+[client/src/**.{js,vue}]
+indent_style = space
+indent_size = 2

bitbucket-pipelines.yml

@@ -5,12 +5,14 @@
 # You can specify a custom docker image from Docker Hub as your build environment.
 image: python:3.6.6
 
+
 clone:
   depth: full
 
-pipelines:
-  default:
-    - step:
+
+definitions:
+  step: &testserver
+    name: testserver
     caches:
     - pip
     services:
@@ -23,9 +25,19 @@ pipelines:
     - export USE_AWS=False
     - pipenv install --dev --system
     - ./server/run_unittests_coverage.sh
-          - git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:master
-
-definitions:
   services:
     postgres:
       image: postgres
+
+
+pipelines:
+  default:
+  - step: *testserver
+
+  branches:
+    master:
+    - step: *testserver
+    - step:
+        name: heroku-deploy
+        script:
+        - git push https://heroku:$HEROKU_API_KEY@git.heroku.com/$HEROKU_APP_NAME.git HEAD:master