chore: Simplify CI flow (#17)

fix #17
salesforce · Jan 7, 2018 · bb05ffd · bb05ffd
1 parent 78b0d45
commit bb05ffd
Showing 1 changed file with 13 additions and 71 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  build:
+  build_and_test:
     working_directory: ~/best
 
     docker:
@@ -15,6 +15,9 @@ jobs:
           - yarn-v3-{{ .Branch }}-
 
       - run: yarn install
+      - run:
+          name: Run Unit Tests
+          command: yarn test
 
       - save_cache:
           paths:
@@ -24,47 +27,7 @@ jobs:
             - yarn.lock
           key: yarn-v3-{{ .Branch }}-{{ checksum "package.json" }}
 
-  unit_test:
-    working_directory: ~/best
-
-    docker:
-      - image: circleci/node:8.9.3-stretch-browsers
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-          - yarn-v3-{{ .Branch }}-{{ checksum "package.json" }}
-          - yarn-v3-{{ .Branch }}-
-
-      - run: yarn install
-
-      - run:
-          name: Unit Test
-          command: yarn test
-
-  perf_test:
-    working_directory: ~/best
-
-    docker:
-      - image: circleci/node:8.9.3-stretch-browsers
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-          - yarn-v3-{{ .Branch }}-{{ checksum "package.json" }}
-          - yarn-v3-{{ .Branch }}-
-
-      - run: yarn install
-      - run: yarn build
-      - run:
-          name: Performance Test - Example project
-          command: yarn perf:example
-
-  compare_perf:
+  perf_and_compare:
     working_directory: ~/best
 
     docker:
@@ -98,6 +61,11 @@ jobs:
 
       - run: yarn install
       - run: yarn build
+
+      - run:
+          name: Performance Test - Example project
+          command: yarn perf:example
+
       - run:
           name: Comparing perf examples
           command: cd examples/simple_benchmark/ && best --compareStats d46ad97 320b079 --externalStorage=@best/store-aws --gitIntegration
@@ -106,33 +74,7 @@ workflows:
   version: 2
   main_workflow:
     jobs:
-      - build:
-          filters:
-            branches:
-              only:
-                - master
-                - /\w+\/.*/
-
-      - unit_test:
-          requires:
-            - build
-          filters:
-            branches:
-              only: /\w+\/.*/
-
-      - perf_test:
-          requires:
-            - build
-          filters:
-            branches:
-              only:
-                - master
-                - /\w+\/.*/
-
-      - compare_perf:
+      - build_and_test
+      - perf_and_compare:
           requires:
-            - perf_test
-          filters:
-            branches:
-              only:
-                - /\w+\/.*/
+            - build_and_test