You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/09/19 09:08:21 UTC
[6/6] flink git commit: [FLINK-7598][travis] fix ineffective shaded
artifacts checks
[FLINK-7598][travis] fix ineffective shaded artifacts checks
This fixes the netty check and makes all of them more robust against failures of
the executed commands counting the number of dependencies.
This closes #4653.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d1acf56d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d1acf56d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d1acf56d
Branch: refs/heads/master
Commit: d1acf56dab2cdaa3406d0191bc7f67bb8ba0d816
Parents: ad4c415
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Thu Sep 7 09:19:51 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue Sep 19 11:06:52 2017 +0200
----------------------------------------------------------------------
tools/travis_mvn_watchdog.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d1acf56d/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index a379845..5232c64 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -270,33 +270,33 @@ watchdog () {
check_shaded_artifacts() {
jar tf build-target/lib/flink-dist*.jar > allClasses
ASM=`cat allClasses | grep '^org/objectweb/asm/' | wc -l`
- if [ $ASM != "0" ]; then
+ if [ "$ASM" != "0" ]; then
echo "=============================================================================="
- echo "Detected $ASM unshaded asm dependencies in fat jar"
+ echo "Detected '$ASM' unshaded asm dependencies in fat jar"
echo "=============================================================================="
return 1
fi
GUAVA=`cat allClasses | grep '^com/google/common' | wc -l`
- if [ $GUAVA != "0" ]; then
+ if [ "$GUAVA" != "0" ]; then
echo "=============================================================================="
- echo "Detected $GUAVA guava dependencies in fat jar"
+ echo "Detected '$GUAVA' guava dependencies in fat jar"
echo "=============================================================================="
return 1
fi
SNAPPY=`cat allClasses | grep '^org/xerial/snappy' | wc -l`
- if [ $SNAPPY == "0" ]; then
+ if [ "$SNAPPY" == "0" ]; then
echo "=============================================================================="
echo "Missing snappy dependencies in fat jar"
echo "=============================================================================="
return 1
fi
- NETTY=`cat allClasses | grep '^io/netty' | wc -1`
- if [ $NETTY != "0" ]; then
+ NETTY=`cat allClasses | grep '^io/netty' | wc -l`
+ if [ "$NETTY" != "0" ]; then
echo "=============================================================================="
- echo "Detected $NETTY unshaded netty dependencies in fat jar"
+ echo "Detected '$NETTY' unshaded netty dependencies in fat jar"
echo "=============================================================================="
return 1
fi