two separate builds for branches and tags

mapbox · Aug 15, 2017 · 97e98ef · 97e98ef
1 parent a6e7730
commit 97e98ef
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,16 +7,15 @@ workflows:
       - build:
           filters:
             tags:
-              only: /v[0-9]+.[0-9]+.[0-9]+(-dev)?/
-      - release:
-          requires:
-            - build
+              ignore: /v[0-9]+.[0-9]+.[0-9]+(-dev)?/
+      - build-and-release:
           filters:
             tags:
               only: /v[0-9]+.[0-9]+.[0-9]+(-dev)?/
             branches:
               ignore: /.*/
 
+
 jobs:
   build:
     docker:
@@ -44,7 +43,7 @@ jobs:
           path: "test/integration/render-tests/index.html"
       - store_artifacts:
           path: "test/integration/query-tests/index.html"
-  release:
+  build-and-release:
     docker:
       - image: mbgl/ci:r4-linux-gl-js
     working_directory: ~/mapbox-gl-js
@@ -62,8 +61,13 @@ jobs:
             - '.eslintcache'
             - 'node_modules'
       - run:
-          name: build-release
-          command: yarn run build-min
+          name: run tests
+          command: |
+            bash ./.circleci/test.sh
+      - store_artifacts:
+          path: "test/integration/render-tests/index.html"
+      - store_artifacts:
+          path: "test/integration/query-tests/index.html"
       - run:
           name: deploy
           when: on_success