#30 - Merged circleci workflows

RHoKAustralia · Sep 4, 2018 · ab12cbc · ab12cbc
1 parent 55ede07
commit ab12cbc
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -87,19 +87,17 @@ jobs:
       - run: npm run deploy-sls
 workflows:
   version: 2
-  frontend-build-deploy:
+  application-build-deploy:
     jobs:
       - ui-build
+      - services-build
       - ui-deploy:
           requires:
             - ui-build
           filters:
             branches:
               only: master
-  backend-build-deploy:
-    jobs:
-      - services-build
       - services-deploy:
           filters:
             branches:
-              only: master
+              only: master