mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-03-25 08:55:50 +00:00
Merge pull request #475 from pimutils/all-tests-in-pr
Run all tests in PR
This commit is contained in:
Markus Unterwaditzer
GitHub
commit
5b87dcceeb
3 changed files with 60 additions and 76 deletions
96
.travis.yml
96
.travis.yml
|
|
@ -9,185 +9,187 @@
|
|||
"submodules": false
|
||||
},
|
||||
"install": [
|
||||
"if [ \"$BUILD_PRS\" = \"true\" ] || [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then\n . scripts/travis-install.sh;\n pip install -U pip;\n pip install wheel;\n make -e install-dev;\n make -e install-$BUILD;\nfi"
|
||||
". scripts/travis-install.sh",
|
||||
"make -e install-dev",
|
||||
"make -e install-$BUILD"
|
||||
],
|
||||
"language": "python",
|
||||
"matrix": {
|
||||
"include": [
|
||||
{
|
||||
"env": "BUILD=style BUILD_PRS=true",
|
||||
"env": "BUILD=style",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal",
|
||||
"python": "2.7"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=style BUILD_PRS=true",
|
||||
"env": "BUILD=style",
|
||||
"python": "3.3"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel",
|
||||
"python": "3.3"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release",
|
||||
"python": "3.3"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal",
|
||||
"python": "3.3"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=style BUILD_PRS=true",
|
||||
"env": "BUILD=style",
|
||||
"python": "3.4"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel",
|
||||
"python": "3.4"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release",
|
||||
"python": "3.4"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal",
|
||||
"python": "3.4"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=style BUILD_PRS=true",
|
||||
"env": "BUILD=style",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true",
|
||||
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false",
|
||||
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal",
|
||||
"python": "3.5"
|
||||
},
|
||||
{
|
||||
"env": "BUILD=style BUILD_PRS=true",
|
||||
"env": "BUILD=style",
|
||||
"python": "pypy"
|
||||
},
|
||||
{
|
||||
|
|
@ -197,8 +199,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"script": [
|
||||
"if [ \"$BUILD_PRS\" = \"true\" ] || [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then\n make -e $BUILD\nfi"
|
||||
],
|
||||
"script": "make -e $BUILD",
|
||||
"sudo": true
|
||||
}
|
||||
|
|
@ -3,13 +3,6 @@ import json
|
|||
import sys
|
||||
|
||||
|
||||
def script(x):
|
||||
return """
|
||||
if [ "$BUILD_PRS" = "true" ] || [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
|
||||
{}
|
||||
fi
|
||||
""".strip().format(x.strip())
|
||||
|
||||
cfg = {}
|
||||
|
||||
cfg['sudo'] = True
|
||||
|
|
@ -23,17 +16,13 @@ cfg['branches'] = {
|
|||
'only': ['auto', 'master']
|
||||
}
|
||||
|
||||
cfg['install'] = [script("""
|
||||
. scripts/travis-install.sh;
|
||||
pip install -U pip;
|
||||
pip install wheel;
|
||||
make -e install-dev;
|
||||
make -e install-$BUILD;
|
||||
""")]
|
||||
cfg['install'] = [
|
||||
". scripts/travis-install.sh",
|
||||
"make -e install-dev",
|
||||
"make -e install-$BUILD"
|
||||
]
|
||||
|
||||
cfg['script'] = [script("""
|
||||
make -e $BUILD
|
||||
""")]
|
||||
cfg['script'] = "make -e $BUILD"
|
||||
|
||||
matrix = []
|
||||
cfg['matrix'] = {'include': matrix}
|
||||
|
|
@ -41,7 +30,7 @@ cfg['matrix'] = {'include': matrix}
|
|||
for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
|
||||
matrix.append({
|
||||
'python': python,
|
||||
'env': 'BUILD=style BUILD_PRS=true'
|
||||
'env': 'BUILD=style'
|
||||
})
|
||||
|
||||
if python == "3.5":
|
||||
|
|
@ -65,22 +54,14 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
|
|||
),
|
||||
("devel", "release", "minimal")
|
||||
):
|
||||
build_prs = (
|
||||
python == "3.5" and
|
||||
server_type == 'DAV' and
|
||||
server == 'radicale'
|
||||
)
|
||||
|
||||
matrix.append({
|
||||
'python': python,
|
||||
'env': ("BUILD=test "
|
||||
"{server_type}_SERVER={server} "
|
||||
"REQUIREMENTS={requirements} "
|
||||
"BUILD_PRS={build_prs}"
|
||||
"REQUIREMENTS={requirements}"
|
||||
.format(server_type=server_type,
|
||||
server=server,
|
||||
requirements=requirements,
|
||||
build_prs='true' if build_prs else 'false'))
|
||||
requirements=requirements))
|
||||
})
|
||||
|
||||
matrix.append({
|
||||
|
|
|
|||
|
|
@ -24,3 +24,6 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
|||
virtualenv -p python3 $HOME/osx-py3
|
||||
. $HOME/osx-py3/bin/activate
|
||||
fi
|
||||
|
||||
pip install -U pip
|
||||
pip install wheel
|
||||
|
|
|
|||
Loading…
Reference in a new issue