diff --git a/.travis.yml b/.travis.yml index 1c64988cc56..2dd29bca46d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: - PATH=$PATH:$HOME/bin matrix: - - XLINT=1 + - ACTION=xlint + - ACTION=consistency-check - ARCH=x86_64 BOOTSTRAP=x86_64 - ARCH=i686 BOOTSTRAP=i686 - ARCH=armv6hf BOOTSTRAP=x86_64 @@ -24,6 +25,7 @@ before_script: - common/travis/fetch_upstream.sh - common/travis/changed_templates.sh - common/travis/xlint.sh + - common/travis/consistency_check.sh - common/travis/bootstrap.sh $BOOTSTRAP script: diff --git a/common/travis/bootstrap.sh b/common/travis/bootstrap.sh index 755f70c2720..351af8beb0a 100755 --- a/common/travis/bootstrap.sh +++ b/common/travis/bootstrap.sh @@ -2,6 +2,6 @@ # # bootstrap.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 ./xbps-src -H $HOME/hostdir binary-bootstrap $1 diff --git a/common/travis/build.sh b/common/travis/build.sh index 782e2facd7e..9b3d6db9c0a 100755 --- a/common/travis/build.sh +++ b/common/travis/build.sh @@ -2,7 +2,7 @@ # # build.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 if [ "$1" != "$2" ]; then arch="-a $2" diff --git a/common/travis/consistency_check.sh b/common/travis/consistency_check.sh new file mode 100755 index 00000000000..17483c8aee8 --- /dev/null +++ b/common/travis/consistency_check.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +# consistency_check.sh + +[ "$ACTION" = "consistency-check" ] || exit 0 + +./xbps-src consistency-check diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh index 89f0c2104c1..2c30d266333 100755 --- a/common/travis/show_files.sh +++ b/common/travis/show_files.sh @@ -2,7 +2,7 @@ # # show_files.sh -[ "$XLINT" ] && exit 0 +[ "$ACTION" ] && exit 0 if [ "$1" != "$2" ]; then arch="-a $2" diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh index 2d5a71b71be..b99d95d98b8 100755 --- a/common/travis/xlint.sh +++ b/common/travis/xlint.sh @@ -2,6 +2,6 @@ # # xlint.sh -[ "$XLINT" ] || exit 0 +[ "$ACTION" = "xlint" ] || exit 0 awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates | xargs xlint