You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ya...@apache.org on 2015/06/11 02:55:57 UTC

samza git commit: SAMZA-474: check-all script fails more gracefully in the absence of gradlew

Repository: samza
Updated Branches:
  refs/heads/master 0f8d7d121 -> 133efd942


SAMZA-474: check-all script fails more gracefully in the absence of gradlew


Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/133efd94
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/133efd94
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/133efd94

Branch: refs/heads/master
Commit: 133efd9428df296bc90c3f0a2e709cd57c31595f
Parents: 0f8d7d1
Author: Aleksandar Pejakovic <a....@levi9.com>
Authored: Wed Jun 10 17:56:13 2015 -0700
Committer: Yan Fang <ya...@gmail.com>
Committed: Wed Jun 10 17:56:13 2015 -0700

----------------------------------------------------------------------
 bin/check-all.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/samza/blob/133efd94/bin/check-all.sh
----------------------------------------------------------------------
diff --git a/bin/check-all.sh b/bin/check-all.sh
index 0725b82..67bf776 100755
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -56,6 +56,21 @@ if [ "$any_not_set" = "true" ]; then
   exit 0
 fi
 
+# chose gradle script (prefers gradlew)
+if [ -e "${base_dir}/gradlew" ]; then
+  gradle_file="${base_dir}/gradlew"
+else
+  gradle_base_file=$(which gradle)
+
+  if [ -f "${gradle_base_file}" ]; then
+    gradle_file="${gradle_base_file}"
+    echo "Gradlew is not found. Using currently installed gradle, found on: ${gradle_file}."
+  else
+    echo "No gradle has been found on system, please install it."
+    exit 1
+  fi
+fi
+
 # run all checks
 for i in "${JDKs[@]}"
 do
@@ -66,7 +81,7 @@ do
     for yarn_version in "${YARNs[@]}"
     do
       echo "------------- Running check task against JDK${jdk_number}/Scala ${scala_version}/YARN ${yarn_version}"
-      $base_dir/gradlew -PscalaVersion=${scala_version} -PyarnVersion=${yarn_version} -Dorg.gradle.java.home=${!i} clean check $@
+      ${gradle_file} -PscalaVersion=${scala_version} -PyarnVersion=${yarn_version} -Dorg.gradle.java.home=${!i} clean check $@
       echo "------------- Finished running check task against JDK${jdk_number}/Scala ${scala_version}/YARN ${yarn_version}"
     done
   done