mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

build,travis: test build PRs (but don't fail for now) 

Rework exec_status to use "tee" to continuously output logs
(so we don't trigger travis timeouts)

Only launch the compile test if everything else is ok
(spare Travis builders a bit)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
Etienne Champetier 2017-08-12 18:30:15 -07:00
parent 59d21da295
commit 45b88fc5d7
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
.travis_do.sh
View File

@ -14,16 +14,21 @@ echo_green() { printf "\033[1;32m$*\033[m\n"; }
echo_blue() { printf "\033[1;34m$*\033[m\n"; } echo_blue() { printf "\033[1;34m$*\033[m\n"; }
exec_status() { exec_status() {
("$@" 2>&1) > logoutput && status=0 || status=1 PATTERN="$1"
grep -qE 'WARNING|ERROR' logoutput && status=1 shift
cat logoutput ("$@" 2>&1) | tee logoutput
if [ $status -eq 0 ]; then R=${PIPESTATUS[0]}
echo_green "=> $* successful" if [ $R -ne 0 ]; then
return 0 echo_red "=> '$*' failed (return code $R)"
else
echo_red "=> $* failed"
return 1 return 1
fi fi
if grep -qE "$PATTERN" logoutput; then
echo_red "=> '$*' failed (log matched '$PATTERN')"
return 1
fi
echo_green "=> '$*' successful"
return 0
} }
# download will run on the `before_script` step # download will run on the `before_script` step
@ -92,15 +97,26 @@ EOF
# pkg_name => muninlite # pkg_name => muninlite
for pkg_dir in $PKGS ; do for pkg_dir in $PKGS ; do
pkg_name=$(echo "$pkg_dir" | awk -F/ '{ print $NF }') pkg_name=$(echo "$pkg_dir" | awk -F/ '{ print $NF }')
echo_blue "=== $pkg_name Testing package" echo_blue "=== $pkg_name: Starting quick tests"
exec_status make "package/$pkg_name/download" V=s || RET=1 exec_status 'WARNING|ERROR' make "package/$pkg_name/download" V=s || RET=1
exec_status make "package/$pkg_name/check" V=s || RET=1 exec_status 'WARNING|ERROR' make "package/$pkg_name/check" V=s || RET=1
echo_blue "=== $pkg_name Finished package" echo_blue "=== $pkg_name: quick tests done"
done done
return $RET [ $RET -ne 0 ] && return $RET
for pkg_dir in $PKGS ; do
pkg_name=$(echo "$pkg_dir" | awk -F/ '{ print $NF }')
echo_blue "=== $pkg_name: Starting compile test"
exec_status '^ERROR' make "package/$pkg_name/compile" V=s -j3
echo_blue "=== $pkg_name: compile test done"
done
return 0
} }
test_commits() { test_commits() {
@ -142,10 +158,7 @@ test_commits() {
} }
test_packages() { test_packages() {
GRET=0 test_commits && test_packages2 || return 1
test_commits || GRET=1
test_packages2 || GRET=1
return $GRET
} }
echo_blue "=== Travis ENV" echo_blue "=== Travis ENV"