Merge pull request #10384 from BKPepe/ytdl

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

diff --git a/.travis_do.sh b/.travis_do.sh
index 71d1104a513060fca91c18774ec7786cad238605..f55b3264e73eafb94c580bc69745e2ae1bdfcbba 100755 (executable)
--- a/.travis_do.sh
+++ b/.travis_do.sh
@@ -5,7 +5,7 @@
 set -e
 
 SDK_HOME="$HOME/sdk"
-SDK_PATH=https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/
+SDK_PATH=https://downloads.openwrt.org/snapshots/targets/ar71xx/generic/
 SDK=-sdk-ar71xx-generic_
 PACKAGES_DIR="$PWD"
 
@@ -53,10 +53,10 @@ download_sdk() {
        wget "$SDK_PATH/sha256sums.gpg" -O sha256sums.asc
 
        # LEDE Build System (LEDE GnuPG key for unattended build jobs)
-       gpg --import $PACKAGES_DIR/.travis/626471F1.asc
+       gpg --import $PACKAGES_DIR/.keys/626471F1.asc
        echo '54CC74307A2C6DC9CE618269CD84BCED626471F1:6:' | gpg --import-ownertrust
        # LEDE Release Builder (17.01 "Reboot" Signing Key)
-       gpg --import $PACKAGES_DIR/.travis/D52BBB6B.asc
+       gpg --import $PACKAGES_DIR/.keys/D52BBB6B.asc
        echo 'B09BE781AE8A0CD4702FDCD3833C6010D52BBB6B:6:' | gpg --import-ownertrust
 
        echo_blue "=== Verifying sha256sums signature"
@@ -136,7 +136,10 @@ EOF
                echo_blue "=== $pkg_name: Starting quick tests"
 
                exec_status '^ERROR' make "package/$pkg_name/download" V=s || RET=1
-               exec_status '^ERROR' make "package/$pkg_name/check" V=s || RET=1
+               badhash_msg_regex="HASH does not match "
+               badhash_msg_regex="$badhash_msg_regex|HASH uses deprecated hash,"
+               badhash_msg_regex="$badhash_msg_regex|HASH is missing,"
+               exec_status '^ERROR'"|$badhash_msg_regex" make "package/$pkg_name/check" V=s || RET=1
 
                echo_blue "=== $pkg_name: quick tests done"
        done