Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Jul 20, 2018
2 parents 19e8736 + 03ddec6 commit cd37688
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hooks/env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD)
[ -n "$SOURCE_BRANCH" ] || SOURCE_BRANCH=$(git symbolic-ref -q --short HEAD)

if $(git describe --exact-match --tags HEAD) "$ret" -eq 0 || [ $SOURCE_BRANCH = "master" ]; then
ANGULAR_MODE="prod"
if [[ $SOURCE_BRANCH = "prod" ]] || [[ $SOURCE_BRANCH == *.*.* ]] ; then
ANGULAR_MODE="prod"
else
ANGULAR_MODE="stage"
fi
ANGULAR_MODE="stage"
fi

0 comments on commit cd37688

Please sign in to comment.