spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felixche...@apache.org
Subject spark git commit: [SPARK-22327][SPARKR][TEST][BACKPORT-2.2] check for version warning
Date Wed, 08 Nov 2017 04:58:32 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-2.2 161ba18a0 -> 5c9035bb4


[SPARK-22327][SPARKR][TEST][BACKPORT-2.2] check for version warning

## What changes were proposed in this pull request?

Will need to port to this to branch-~~1.6~~, -2.0, -2.1, -2.2

## How was this patch tested?

manually
Jenkins, AppVeyor

Author: Felix Cheung <felixcheung_m@hotmail.com>

Closes #19619 from felixcheung/rcranversioncheck22.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5c9035bb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5c9035bb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5c9035bb

Branch: refs/heads/branch-2.2
Commit: 5c9035bb473d08dfca3b2a04b0f79313b8188427
Parents: 161ba18
Author: Felix Cheung <felixcheung_m@hotmail.com>
Authored: Tue Nov 7 20:58:29 2017 -0800
Committer: Felix Cheung <felixcheung@apache.org>
Committed: Tue Nov 7 20:58:29 2017 -0800

----------------------------------------------------------------------
 R/run-tests.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/5c9035bb/R/run-tests.sh
----------------------------------------------------------------------
diff --git a/R/run-tests.sh b/R/run-tests.sh
index 29764f4..f38c86e 100755
--- a/R/run-tests.sh
+++ b/R/run-tests.sh
@@ -38,6 +38,7 @@ FAILED=$((PIPESTATUS[0]||$FAILED))
 NUM_CRAN_WARNING="$(grep -c WARNING$ $CRAN_CHECK_LOG_FILE)"
 NUM_CRAN_ERROR="$(grep -c ERROR$ $CRAN_CHECK_LOG_FILE)"
 NUM_CRAN_NOTES="$(grep -c NOTE$ $CRAN_CHECK_LOG_FILE)"
+HAS_PACKAGE_VERSION_WARN="$(grep -c "Insufficient package version" $CRAN_CHECK_LOG_FILE)"
 
 if [[ $FAILED != 0 || $NUM_TEST_WARNING != 0 ]]; then
     cat $LOGFILE
@@ -46,9 +47,10 @@ if [[ $FAILED != 0 || $NUM_TEST_WARNING != 0 ]]; then
     echo -en "\033[0m"  # No color
     exit -1
 else
-    # We have 2 existing NOTEs for new maintainer, attach()
-    # We have one more NOTE in Jenkins due to "No repository set"
-    if [[ $NUM_CRAN_WARNING != 0 || $NUM_CRAN_ERROR != 0 || $NUM_CRAN_NOTES -gt 3 ]]; then
+    # We have 2 NOTEs for RoxygenNote, attach(); and one in Jenkins only "No repository set"
+    # For non-latest version branches, one WARNING for package version
+    if [[ ($NUM_CRAN_WARNING != 0 || $NUM_CRAN_ERROR != 0 || $NUM_CRAN_NOTES -gt 3) &&
+          ($HAS_PACKAGE_VERSION_WARN != 1 || $NUM_CRAN_WARNING != 1 || $NUM_CRAN_ERROR !=
0 || $NUM_CRAN_NOTES -gt 2) ]]; then
       cat $CRAN_CHECK_LOG_FILE
       echo -en "\033[31m"  # Red
       echo "Had CRAN check errors; see logs."


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message