diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-18 12:36:50 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-18 12:40:00 +0300 |
| commit | e0b1222273dc37edb1851b9de9a38bfcde050035 (patch) | |
| tree | b7487aba5989178a837679d7b6e0a04db7967051 | |
| parent | 29ee2ad94084ec9af3b6adb4c2ee1987648ae697 (diff) | |
Fix test execution
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | .gitignore | 59 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 60 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de542ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,59 @@ +# just sane ignores +.*.sw[po] +*.bak +*.BAK +*~ +*.orig +*.class +.cvsignore +Thumbs.db +*.py[co] +_darcs/* +CVS/* +.svn/* +RCS/* +*.backup* + +# kdevelop +.kdev +*.kdev4 +*.kate-swp + +# Lokalize +*lokalize* + +# eclipse +.project +.settings + +# netbeans +nbproject + +# phpStorm +.idea +*.iml + +# geany +*.geany + +# Cloud9IDE +.settings.xml +.c9revisions + +# vim ex mode +.vimrc + +# Mac OS +.DS_Store + +# WebFinger +.well-known +/.buildpath + +# Tests - auto-generated files +/PhantomJS_* +/tests/coverage* +/tests/clover.xml +/tests/js/node_modules +/tests/js/run.sh +/tests/karma-coverage diff --git a/.travis.yml b/.travis.yml index 8836899..7525a59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ branches: before_install: - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - . ./before_install.sh $APP_NAME $CORE_BRANCH $DB # Add some output debugging information - cd ../server |