Repository: spark Updated Branches: refs/heads/branch-2.1 acef22429 -> ca19271cc
[SPARK-22327][SPARKR][TEST][BACKPORT-2.1] 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 <felixcheun...@hotmail.com> Closes #19620 from felixcheung/rcranversioncheck21. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ca19271c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ca19271c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ca19271c Branch: refs/heads/branch-2.1 Commit: ca19271cc796f54d2e575bf0c54dbcae4ab7d4a2 Parents: acef224 Author: Felix Cheung <felixcheun...@hotmail.com> Authored: Tue Nov 7 20:57:39 2017 -0800 Committer: Felix Cheung <felixche...@apache.org> Committed: Tue Nov 7 20:57:39 2017 -0800 ---------------------------------------------------------------------- R/run-tests.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ca19271c/R/run-tests.sh ---------------------------------------------------------------------- diff --git a/R/run-tests.sh b/R/run-tests.sh index dab6d2d..ead0c97 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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org