Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
9d35cacf
Commit
9d35cacf
authored
9 years ago
by
Joas Schilling
Browse files
Options
Downloads
Patches
Plain Diff
Make Travis CI pass when DAV was not touched
parent
527ef76d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+9
-7
9 additions, 7 deletions
.travis.yml
tests/travis/changed_app.sh
+18
-0
18 additions, 0 deletions
tests/travis/changed_app.sh
with
27 additions
and
7 deletions
.travis.yml
+
9
−
7
View file @
9d35cacf
...
...
@@ -5,7 +5,7 @@ php:
env
:
global
:
-
APP=
dav
-
TEST_DAV=$(tests/travis/changed_app.sh
dav
)
-
TC=litmus-v2
matrix
:
-
DB=sqlite
...
...
@@ -21,20 +21,22 @@ addons:
-
realpath
before_install
:
-
bash tests/travis/test_for_app.sh $APP
-
bash tests/travis/before_install.sh $DB
-
sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi"
install
:
-
bash tests/travis/install.sh $DB
-
sh -c "if [ '$TEST_DAV' = '1' ]; then
bash tests/travis/install.sh $DB
; fi"
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
:
include
:
-
php
:
5.4
env
:
DB=pgsql;TC=litmus-v1
;APP=dav
env
:
DB=pgsql;TC=litmus-v1
# - php: 5.4
# env: DB=mysql;TC=caldavtester
;APP=dav
# env: DB=mysql;TC=caldavtester
fast_finish
:
true
This diff is collapsed.
Click to expand it.
tests/travis/
test_for
_app.sh
→
tests/travis/
changed
_app.sh
+
18
−
0
View file @
9d35cacf
...
...
@@ -2,16 +2,17 @@
#
# ownCloud
#
# @author Joas Schilling
# @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 ...."
FOUND
=
$(
git diff
${
TRAVIS_COMMIT_RANGE
}
|
grep
--
"^+++ b/apps/
$APP
/"
)
if
[
"x
$FOUND
"
!=
'x'
]
;
then
echo
"1"
else
echo
"Test config is not relevant for this change. terminating"
exit
1
echo
"0"
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment