Skip to content

Commit

Permalink
Merge pull request #31 from citusdata/develop-merge
Browse files Browse the repository at this point in the history
Merge develop branch to master
  • Loading branch information
velioglu authored Jan 16, 2018
2 parents 7c6cc08 + f145ab9 commit 305cca9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion travis/build_new_nightly
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ hubapiurl+="sha=${nightlyref}&since=${lastnightly}&per_page=1"
newcommitcount=$(curl -sf -H "${hubauth}" "${hubapiurl}" | jq -r 'length')

if [ "${newcommitcount}" -gt 0 ]; then
citus_package -p "${TARGET_PLATFORM}" 'local' nightly
citus_package -p "${TARGET_PLATFORM}" 'local' nightly 2>&1 > citus_package.log
echo "Warnings generated by nightly docker build :"
grep -Ei '(warning|\bi|\be|\bw):' citus_package.log
mkdir -p pkgs/nightlies
shopt -s nullglob
mv ./*/*.rpm ./*/*.deb pkgs/nightlies
Expand Down
4 changes: 3 additions & 1 deletion travis/build_new_release
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ esac

needrelease=$(echo "${httpbody}" | jq -r "${jqfilter} | index(\"${pkglatest}\") < 0")
if [ "${needrelease}" == "true" ]; then
citus_package -p "${TARGET_PLATFORM}" 'local' release
citus_package -p "${TARGET_PLATFORM}" 'local' release 2>&1 > citus_package.log
echo "Warnings generated by release docker build :"
grep -Ei '(warning|\bi|\be|\bw):' citus_package.log
mkdir -p pkgs/releases
shopt -s nullglob
mv ./*/*.rpm ./*/*.deb pkgs/releases
Expand Down

0 comments on commit 305cca9

Please sign in to comment.