File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -187,7 +187,7 @@ commands:
187187 - run :
188188 name : Store commit hash and prerelease
189189 command : |
190- if [[ $CIRCLE_BRANCH == release || -n $CIRCLE_TAG ]]; then
190+ if [[ -n $CIRCLE_TAG ]]; then
191191 echo -n > prerelease.txt;
192192 else
193193 date -u +"nightly.%Y.%-m.%-d" > prerelease.txt;
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ prerelease_source="${1:-ci}"
99
1010cd " ${ROOTDIR} "
1111
12- if [[ $CIRCLE_BRANCH == release || -n $CIRCLE_TAG || -n $FORCE_RELEASE ]]; then
12+ if [[ -n $CIRCLE_TAG || -n $FORCE_RELEASE ]]; then
1313 echo -n > prerelease.txt
1414else
1515 # Use last commit date rather than build date to avoid ending up with builds for
2525mkdir -p build
2626cd build
2727
28- [[ -n $COVERAGE && $CIRCLE_BRANCH != release && -z $CIRCLE_TAG ]] && CMAKE_OPTIONS=" $CMAKE_OPTIONS -DCOVERAGE=ON"
28+ [[ -n $COVERAGE && -z $CIRCLE_TAG ]] && CMAKE_OPTIONS=" $CMAKE_OPTIONS -DCOVERAGE=ON"
2929
3030# shellcheck disable=SC2086
3131cmake .. -DCMAKE_BUILD_TYPE=" ${CMAKE_BUILD_TYPE:- Release} " $CMAKE_OPTIONS
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ function build() {
4545
4646 cd " ${ROOT_DIR} "
4747
48- if [[ $CIRCLE_BRANCH == release || -n $CIRCLE_TAG || -n $FORCE_RELEASE || $( git tag --points-at HEAD 2> /dev/null) == v* ]]; then
48+ if [[ -n $CIRCLE_TAG || -n $FORCE_RELEASE || $( git tag --points-at HEAD 2> /dev/null) == v* ]]; then
4949 echo -n > prerelease.txt
5050 else
5151 # Use last commit date rather than build date to avoid ending up with builds for
You can’t perform that action at this time.
0 commit comments