Skip to content

Commit a88c9b5

Browse files
committed
Merge branch 'develop'
2 parents 8380536 + bbbb0b9 commit a88c9b5

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ workflows:
106106
- "build-prod":
107107
filters:
108108
branches:
109-
only: master
109+
ignore: /.*/
110110
tags:
111111
only: /v[0-9]+(\.[0-9]+)*/
112112

@@ -117,4 +117,3 @@ workflows:
117117
branches:
118118
ignore:
119119
- develop
120-
- master

build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#!/bin/bash
22
set -eo pipefail
33

4+
# Skips build for tags on no-master branch.
5+
if [ ! -z $CIRCLE_TAG ] && [[ $CIRCLE_BRANCH != "master" ]]
6+
then
7+
echo "Tag build for branches other than master are failed by default!"
8+
exit 1
9+
fi
10+
411
# Builds Docker image of Community App application.
512
# This script expects a single argument: NODE_ENV, which must be either
613
# "development" or "production".

0 commit comments

Comments
 (0)