Update nightly upload script to also build and update binaries for darwin

Author: Pawan Rawal

contrib/nightly/build-windows.sh contrib/nightly/build-cross-platform.sh

@@ -11,14 +11,14 @@ set -e
 echo -e "\n\n Downloading xgo"
 go get github.com/karalabe/xgo
 
-asset_suffix=$1
+platform=$1
+asset_suffix=$2
 cur_dir=$(pwd);
 tmp_dir=/tmp/dgraph-build;
 release_version=$(git describe --abbrev=0);
 if [[ -n $asset_suffix ]]; then
   release_version="$release_version${asset_suffix}"
 fi
-platform="windows"
 
 # TODO - Add checksum file later when we support get.dgraph.io for Windows.
 
@@ -33,28 +33,42 @@ source $GOPATH/src/github.com/dgraph-io/dgraph/contrib/nightly/constants.sh
 
 pushd $GOPATH/src/github.com/dgraph-io/dgraph/dgraph > /dev/null
 
-xgo_target="windows/amd64"
+if [[ $platform == "windows" ]]; then
+  xgo_target="windows/amd64"
+else
+  xgo_target="darwin-10.9/amd64"
+fi
+
 echo -e "\n\n\033[1;33mBuilding binaries for $platform\033[0m"
 xgo --go 1.8.3 --targets $xgo_target -ldflags \
   "-X $release=$release_version -X $branch=$gitBranch -X $commitSHA1=$lastCommitSHA1 -X '$commitTime=$lastCommitTime' -X $uiDir=$ui" .;
 
-cp dgraph-windows-4.0-amd64.exe dgraph.exe
-
 echo -e "\n\033[1;33mCopying binaries to tmp folder\033[0m"
-pushd $tmp_dir > /dev/null
-cp $GOPATH/src/github.com/dgraph-io/dgraph/dgraph/dgraph.exe .
-echo -e "\n\033[1;34mSize of files: $(du -sh)\033[0m"
-popd &> /dev/null
+if [[ $platform == "windows" ]]; then
+  cp dgraph-windows-4.0-amd64.exe $tmp_dir/dgraph.exe
+else
+  cp dgraph-darwin-10.9-amd64 $tmp_dir/dgraph
+fi
+
+echo -e "\n\033[1;34mSize of files: $(du -sh $tmp_dir)\033[0m"
 
 echo -e "\n\033[1;33mCreating tar file\033[0m"
-tar_file=dgraph-"$platform"-amd64-$release_version
+tar_file=dgraph-"$platform"-amd64-$release_version.tar.gz
+
 # Create a tar file with the contents of the dgraph folder (i.e the binaries)
 pushd $tmp_dir > /dev/null
-tar -zcvf $tar_file.tar.gz dgraph.exe;
-echo -e "\n\033[1;34mSize of tar file: $(du -sh $tar_file.tar.gz)\033[0m"
+if [[ $platform == "windows" ]]; then
+  tar -zcvf $tar_file dgraph.exe
+else
+  checksum=$(shasum -a 256 dgraph | awk '{print $1}')
+  echo "$checksum /usr/local/bin/dgraph" >> $cur_dir/"dgraph-checksum-darwin-amd64-$release_version".sha256
+  tar -zcvf $tar_file dgraph
+fi
+
+echo -e "\n\033[1;34mSize of tar file: $(du -sh $tar_file)\033[0m"
 
 echo -e "\n\033[1;33mMoving tarfile to original directory\033[0m"
-mv $tar_file.tar.gz $cur_dir
+mv $tar_file $cur_dir
 popd > /dev/null
 rm -rf $tmp_dir
 

contrib/nightly/build.sh

@@ -49,7 +49,8 @@ fi
 # Create the checksum file for dgraph binary.
 checksum_file=$cur_dir/"dgraph-checksum-$platform-amd64-$release_version".sha256
 if [ -f "$checksum_file" ]; then
-	rm $checksum_file
+  rm $checksum_file
+  rm -rf $cur_dir/"dgraph-checksum-darwin-amd64-$release_version".sha256
 fi
 
 checksum=$($digest_cmd dgraph | awk '{print $1}')
@@ -77,6 +78,7 @@ mv $tmp_dir ./
 GZIP=-n tar -zcf assets.tar.gz -C $GOPATH/src/github.com/dgraph-io/dgraph/dashboard/build .
 checksum=$($digest_cmd assets.tar.gz | awk '{print $1}')
 echo "$checksum /usr/local/share/dgraph/assets.tar.gz" >> $checksum_file
+echo "$checksum /usr/local/share/dgraph/assets.tar.gz" >> $cur_dir/"dgraph-checksum-darwin-amd64-$release_version".sha256
 
 # Only run this locally.
 if [[ $TRAVIS != true ]]; then

contrib/nightly/upload.sh

@@ -92,11 +92,7 @@ else
 	echo "Running nightly script"
 fi
 
-if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-	OS="darwin"
-else
-	OS="linux"
-fi
+OS="linux"
 
 DGRAPH=$GOPATH/src/github.com/dgraph-io/dgraph
 BUILD_DIR=$DGRAPH/contrib/nightly
@@ -109,8 +105,10 @@ LATEST_TAG=$(curl -s https://api.github.com/repos/dgraph-io/dgraph/releases/late
 DGRAPH_COMMIT=$(git rev-parse HEAD)
 TAR_FILE="dgraph-${OS}-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.tar.gz"
 NIGHTLY_FILE="${GOPATH}/src/github.com/dgraph-io/dgraph/${TAR_FILE}"
+OSX_NIGHTLY_FILE="${GOPATH}/src/github.com/dgraph-io/dgraph/dgraph-darwin-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.tar.gz"
 SHA_FILE_NAME="dgraph-checksum-${OS}-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.sha256"
 SHA_FILE="${GOPATH}/src/github.com/dgraph-io/dgraph/${SHA_FILE_NAME}"
+OSX_SHA_FILE="${GOPATH}/src/github.com/dgraph-io/dgraph/dgraph-checksum-darwin-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.sha256"
 ASSETS_FILE="${GOPATH}/src/github.com/dgraph-io/dgraph/assets.tar.gz"
 CURRENT_BRANCH=$TRAVIS_BRANCH
 CURRENT_DIR=$(pwd)
@@ -176,28 +174,32 @@ upload_assets() {
 	local name="dgraph-${OS}-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.tar.gz"
 	update_or_create_asset $release_id $name ${NIGHTLY_FILE}
 
+	local name="dgraph-darwin-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.tar.gz"
+	update_or_create_asset $release_id $name ${OSX_NIGHTLY_FILE}
+
 	local sha_name="dgraph-checksum-${OS}-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.sha256"
 	update_or_create_asset $release_id $sha_name ${SHA_FILE}
 
-	if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-		# As asset would be the same on both platforms, we only upload it from linux.
-		update_or_create_asset $release_id "assets.tar.gz" ${ASSETS_FILE}
-		update_or_create_asset $release_id $WINDOWS_TAR_NAME ${NIGHTLY_WINDOWS_FILE}
+	local sha_name="dgraph-checksum-darwin-amd64-${DGRAPH_VERSION}${ASSET_SUFFIX}.sha256"
+	update_or_create_asset $release_id $sha_name ${OSX_SHA_FILE}
 
-		# We dont want to update description programatically for version releases and commit apart from
-		# nightly.
-		if [[ $BUILD_TAG == "nightly" ]]; then
-			echo 'Updating release description.'
-			# TODO(pawan) - This fails, investigate and fix.
-			# 			send_gh_api_data_request repos/${DGRAPH_REPO}/releases/${release_id} PATCH \
-			# 				"{ \"force\": true, \"body\": $(get_nightly_release_body) | jq -s -c -R '.') }" \
-			# 				> /dev/null
-			#
-			echo "Updating ${BUILD_TAG} tag to point to ${DGRAPH_COMMIT}."
-			send_gh_api_data_request repos/${DGRAPH_REPO}/git/refs/tags/${BUILD_TAG} PATCH \
-				"{ \"force\": true, \"sha\": \"${DGRAPH_COMMIT}\" }" \
-				> /dev/null
-		fi
+	# As asset would be the same on both platforms, we only upload it from linux.
+	update_or_create_asset $release_id "assets.tar.gz" ${ASSETS_FILE}
+	update_or_create_asset $release_id $WINDOWS_TAR_NAME ${NIGHTLY_WINDOWS_FILE}
+
+	# We dont want to update description programatically for version releases and commit apart from
+	# nightly.
+	if [[ $BUILD_TAG == "nightly" ]]; then
+		echo 'Updating release description.'
+		# TODO(pawan) - This fails, investigate and fix.
+		# 			send_gh_api_data_request repos/${DGRAPH_REPO}/releases/${release_id} PATCH \
+		# 				"{ \"force\": true, \"body\": $(get_nightly_release_body) | jq -s -c -R '.') }" \
+		# 				> /dev/null
+		#
+		echo "Updating ${BUILD_TAG} tag to point to ${DGRAPH_COMMIT}."
+		send_gh_api_data_request repos/${DGRAPH_REPO}/git/refs/tags/${BUILD_TAG} PATCH \
+			"{ \"force\": true, \"sha\": \"${DGRAPH_COMMIT}\" }" \
+			> /dev/null
 	fi
 }
 
@@ -213,10 +215,6 @@ docker_tag() {
 docker_tag
 
 build_docker_image() {
-	if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-		return 0
-	fi
-
 	pushd $DGRAPH/contrib/nightly > /dev/null
 	# Extract dgraph binary from the tar into dgraph-build folder.
 	if [ ! -d dgraph-build ]; then
@@ -235,10 +233,6 @@ build_docker_image() {
 }
 
 upload_docker_image() {
-	if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-		return 0
-	fi
-
 	echo "Logging into Docker."
 	docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
 	echo "Pushing the image"
@@ -252,10 +246,10 @@ upload_docker_image() {
 }
 
 pushd $DGRAPH > /dev/null
+
+$BUILD_DIR/build-cross-platform.sh "windows" $ASSET_SUFFIX
+$BUILD_DIR/build-cross-platform.sh "darwin" $ASSET_SUFFIX
 $BUILD_DIR/build.sh $ASSET_SUFFIX
-if [[ $TRAVIS_OS_NAME == "linux" ]]; then
-	$BUILD_DIR/build-windows.sh $ASSET_SUFFIX
-fi
 
 if [[ $DOCKER_TAG == "" ]]; then
   echo -e "No docker tag found. Exiting the script"

contrib/scripts/cover.sh

@@ -21,7 +21,7 @@ set -e
 # create coverage output
 echo 'mode: atomic' > $OUT
 for PKG in $(go list ./...|grep -v -E 'vendor|contrib|wiki|customtok'); do
-  #if [[ "$TRAVIS_BRANCH" =~ master|release\/ && $TRAVIS_OS_NAME == "linux" ]]; then
+  #if [[ "$TRAVIS_BRANCH" =~ master|release\/ ]]; then
     #echo "Running tests with race flag."
     #go test -v -race -timeout=30m -covermode=atomic -coverprofile=$TMP $PKG
   #else

contrib/scripts/install.sh

@@ -4,11 +4,6 @@
 
 set -e
 
-if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-  brew update
-  brew install jq
-fi
-
 # Lets install the dependencies that are not vendored in anymore.
 go get -d golang.org/x/net/context
 go get -d google.golang.org/grpc/...

contrib/scripts/loader.sh

@@ -78,11 +78,7 @@ pushd dgraph &> /dev/null
 dataCount="1120879"
 # Concat exported files to get total count.
 cat $(ls -t export/dgraph-1-* | head -1) $(ls -t export/dgraph-2-* | head -1) > export/dgraph-export.rdf.gz
-if [[ $TRAVIS_OS_NAME == "osx" ]]; then
-  exportCount=$(zcat < export/dgraph-export.rdf.gz | wc -l)
-else
-  exportCount=$(zcat export/dgraph-export.rdf.gz | wc -l)
-fi
+exportCount=$(zcat export/dgraph-export.rdf.gz | wc -l)
 popd &> /dev/null
 
 if [[ ! "$exportCount" -eq "$dataCount" ]]; then