build,travis: fix gpg verification warning

[feed/packages.git] / .travis_do.sh

diff --git a/.travis_do.sh b/.travis_do.sh
index 54bc59e4aa767c45ec983854a9e4617a847c7edd..3c39aeed3473b6c66b21a8e506dbc2520af36931 100755 (executable)
--- a/.travis_do.sh
+++ b/.travis_do.sh
@@ -19,7 +19,7 @@ exec_status() {
        while :;do sleep 590;echo "still running (please don't kill me Travis)";done &
        ("$@" 2>&1) | tee logoutput
        R=${PIPESTATUS[0]}
-       kill $!
+       kill $! && wait $! 2>/dev/null
        if [ $R -ne 0 ]; then
                echo_red   "=> '$*' failed (return code $R)"
                return 1
@@ -45,9 +45,12 @@ download_sdk() {
        wget "$SDK_PATH/sha256sums.gpg" -O sha256sums.asc
 
        # LEDE Build System (LEDE GnuPG key for unattended build jobs)
-       gpg --recv 0xCD84BCED626471F1
+       gpg --import $PACKAGES_DIR/.travis/626471F1.asc
+       echo '54CC74307A2C6DC9CE618269CD84BCED626471F1:6:' | gpg --import-ownertrust
        # LEDE Release Builder (17.01 "Reboot" Signing Key)
-       gpg --recv 0x833C6010D52BBB6B
+       gpg --import $PACKAGES_DIR/.travis/D52BBB6B.asc
+       echo 'B09BE781AE8A0CD4702FDCD3833C6010D52BBB6B:6:' | gpg --import-ownertrust
+
        gpg --verify sha256sums.asc
        grep "$SDK" sha256sums > sha256sums.small
 
@@ -92,9 +95,9 @@ EOF
        # enable BUILD_LOG
        sed -i '1s/^/config BUILD_LOG\n\tbool\n\tdefault y\n\n/' Config-build.in
 
-       ./scripts/feeds update -a
-       ./scripts/feeds install -a
-       make defconfig
+       ./scripts/feeds update -a > /dev/null
+       ./scripts/feeds install -a > /dev/null
+       make defconfig > /dev/null
        echo_blue "=== Setting up SDK done"
 
        RET=0
@@ -118,16 +121,23 @@ EOF
 
                # we can't enable verbose built else we often hit Travis limits
                # on log size and the job get killed
-               exec_status '^ERROR' make "package/$pkg_name/compile" -j3
+               exec_status '^ERROR' make "package/$pkg_name/compile" -j3 || RET=1
 
                echo_blue "=== $pkg_name: compile test done"
 
                echo_blue "=== $pkg_name: begin compile logs"
-               cat logs/package/feeds/packages/$pkg_name/compile.txt
+               for f in $(find logs/package/feeds/packages/$pkg_name/ -type f); do
+                       echo_blue "Printing last 200 lines of $f"
+                       tail -n200 "$f"
+               done
                echo_blue "=== $pkg_name: end compile logs"
+
+               echo_blue "=== $pkg_name: begin packages sizes"
+               du -ba bin/
+               echo_blue "=== $pkg_name: end packages sizes"
        done
 
-       return 0
+       return $RET
 }
 
 test_commits() {