Merge branch 'develop'

topcoder-platform · Sep 6, 2017 · a88c9b5 · a88c9b5
2 parents 8380536 + bbbb0b9
commit a88c9b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,7 +106,7 @@ workflows:
       - "build-prod":
           filters:
             branches:
-              only: master
+              ignore: /.*/
             tags:
               only: /v[0-9]+(\.[0-9]+)*/
 
@@ -117,4 +117,3 @@ workflows:
             branches:
               ignore:
                 - develop
-                - master
diff --git a/build.sh b/build.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 set -eo pipefail
 
+# Skips build for tags on no-master branch.
+if [ ! -z $CIRCLE_TAG ] && [[ $CIRCLE_BRANCH != "master" ]]
+then
+  echo "Tag build for branches other than master are failed by default!"
+  exit 1
+fi
+
 # Builds Docker image of Community App application.
 # This script expects a single argument: NODE_ENV, which must be either
 # "development" or "production".