Make Travis CI pass when DAV was not touched
This commit is contained in:
parent
527ef76dd6
commit
9d35cacfda
16
.travis.yml
16
.travis.yml
|
@ -5,7 +5,7 @@ php:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- APP=dav
|
- TEST_DAV=$(tests/travis/changed_app.sh dav)
|
||||||
- TC=litmus-v2
|
- TC=litmus-v2
|
||||||
matrix:
|
matrix:
|
||||||
- DB=sqlite
|
- DB=sqlite
|
||||||
|
@ -21,20 +21,22 @@ addons:
|
||||||
- realpath
|
- realpath
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- bash tests/travis/test_for_app.sh $APP
|
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi"
|
||||||
- bash tests/travis/before_install.sh $DB
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- bash tests/travis/install.sh $DB
|
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi"
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- bash apps/$APP/tests/travis/$TC.sh
|
- sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
|
||||||
|
- sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
|
||||||
|
|
||||||
|
- sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC.sh; fi"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- php: 5.4
|
- php: 5.4
|
||||||
env: DB=pgsql;TC=litmus-v1;APP=dav
|
env: DB=pgsql;TC=litmus-v1
|
||||||
# - php: 5.4
|
# - php: 5.4
|
||||||
# env: DB=mysql;TC=caldavtester;APP=dav
|
# env: DB=mysql;TC=caldavtester
|
||||||
|
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# ownCloud
|
||||||
|
#
|
||||||
|
# @author Joas Schilling
|
||||||
|
# @author Thomas Müller
|
||||||
|
# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
|
||||||
|
#
|
||||||
|
|
||||||
|
APP=$1
|
||||||
|
|
||||||
|
FOUND=$(git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/")
|
||||||
|
|
||||||
|
if [ "x$FOUND" != 'x' ]; then
|
||||||
|
echo "1"
|
||||||
|
else
|
||||||
|
echo "0"
|
||||||
|
fi
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# ownCloud
|
|
||||||
#
|
|
||||||
# @author Thomas Müller
|
|
||||||
# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
|
|
||||||
#
|
|
||||||
|
|
||||||
set -e
|
|
||||||
APP=$1
|
|
||||||
|
|
||||||
if git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/"; then
|
|
||||||
echo "Executing this test config ...."
|
|
||||||
else
|
|
||||||
echo "Test config is not relevant for this change. terminating"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
Loading…
Reference in New Issue