From fc2db795699630728daeb28421ca8e0eb9fcc86e Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Mon, 14 Aug 2017 21:02:12 -0400
Subject: [PATCH] two separate builds for branches and tags

---
 .circleci/config.yml | 18 +++++++++++-------
 .circleci/deploy.sh  |  6 ------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ca7bac5fe5..3177cf592b1 100644
--- 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
diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
index 138d813da00..4fe201e6bb3 100755
--- a/.circleci/deploy.sh
+++ b/.circleci/deploy.sh
@@ -1,12 +1,6 @@
 #!/bin/bash
 
 set -eu
-set -o pipefail
-
-PACKAGE_JSON_VERSION=`node -e "console.log(require('./package.json').version)"`
-
-echo $PACKAGE_JSON_VERSION
-echo $CIRCLE_TAG
 
 if [ -z $CIRCLE_TAG ]; then
     echo '$CIRCLE_TAG must be set'