Skip to content

Commit

Permalink
Master build updates (hyperledger-archives#3034)
Browse files Browse the repository at this point in the history
* add in env

Signed-off-by: Matthew B White <[email protected]>

* Extra quote present in JSON.

Signed-off-by: Matthew B White <[email protected]>

* missing return code

Signed-off-by: Matthew B White <[email protected]>

* unstable builds  json quoting

Signed-off-by: Matthew B White <[email protected]>
  • Loading branch information
mbwhite authored Dec 21, 2017
1 parent 608e510 commit 2af9bb6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if [ ! -f ${DIR}/build.cfg ]; then
BUILD_FOCUS="next"
BUILD_RELEASE="unstable"
else
_exit "unable to determine build focus ${TRAVIS_BRANCH} ${TRAVIS_TAG}" 1
_exit "unable to determine build focus branch=${TRAVIS_BRANCH} tag=${TRAVIS_TAG}" 1
fi
else
if [[ "${TRAVIS_BRANCH}" =~ ${NEXT_REGEXP} ]]; then
Expand All @@ -49,7 +49,7 @@ if [ ! -f ${DIR}/build.cfg ]; then
BUILD_FOCUS="latest"
BUILD_RELEASE="stable"
else
_exit "unable to determine build focus ${TRAVIS_BRANCH} ${TRAVIS_TAG}" 1
_exit "unable to determine build focus branch=${TRAVIS_BRANCH} tag=${TRAVIS_TAG}" 1
fi
fi

Expand Down
4 changes: 2 additions & 2 deletions .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ if [[ "${BUILD_RELEASE}" == "unstable" ]]; then

if [[ "${BUILD_FOCUS}" = "latest" ]]; then
PLAYGROUND_SUFFIX="-unstable"
WEB_CFG="'{\"webonly\":true}'"
WEB_CFG="{\"webonly\":true}"
TAG="unstable"
elif [[ "${BUILD_FOCUS}" = "next" ]]; then
PLAYGROUND_SUFFIX="-next-unstable"
WEB_CFG="'{\"webonly\":true}'"
WEB_CFG="{\"webonly\":true}"
TAG="next-unstable"
else
_exit "Unknown build focus" 1
Expand Down

0 comments on commit 2af9bb6

Please sign in to comment.