sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Run all tests in PR" (#483)

Browse source
This commit is contained in:
Markus Unterwaditzer 2016-07-26 21:49:47 +02:00 committed by GitHub
parent 48d72aa7a1
commit 707c824c2b
3 changed files with 76 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
.travis.yml
View file

@ -9,187 +9,185 @@
"submodules": false "submodules": false
}, },
"install": [ "install": [
". scripts/travis-install.sh", "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"
"make -e install-dev",
"make -e install-$BUILD"
], ],
"language": "python", "language": "python",
"matrix": { "matrix": {
"include": [ "include": [
{ {
"env": "BUILD=style", "env": "BUILD=style BUILD_PRS=true",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false",
"python": "2.7" "python": "2.7"
}, },
{ {
"env": "BUILD=style", "env": "BUILD=style BUILD_PRS=true",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=style", "env": "BUILD=style BUILD_PRS=true",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=false",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=style", "env": "BUILD=style BUILD_PRS=true",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=release BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal", "env": "BUILD=test REMOTESTORAGE_SERVER=mysteryshack REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=devel BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=minimal BUILD_PRS=false",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=style", "env": "BUILD=style BUILD_PRS=true",
"python": "pypy" "python": "pypy"
}, },
{ {
@ -199,6 +197,8 @@
} }
] ]
}, },
"script": "make -e $BUILD", "script": [
"if [ \"$BUILD_PRS\" = \"true\" ] || [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ]; then\n make -e $BUILD\nfi"
],
"sudo": true "sudo": true
} }

37
scripts/make_travisconf.py
View file

@ -3,6 +3,13 @@ import json
import sys import sys
def script(x):
return """
if [ "$BUILD_PRS" = "true" ] || [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
{}
fi
""".strip().format(x.strip())
cfg = {} cfg = {}
cfg['sudo'] = True cfg['sudo'] = True
@ -16,13 +23,17 @@ cfg['branches'] = {
'only': ['auto', 'master'] 'only': ['auto', 'master']
} }
cfg['install'] = [ cfg['install'] = [script("""
". scripts/travis-install.sh", . scripts/travis-install.sh;
"make -e install-dev", pip install -U pip;
"make -e install-$BUILD" pip install wheel;
] make -e install-dev;
make -e install-$BUILD;
""")]
cfg['script'] = "make -e $BUILD" cfg['script'] = [script("""
make -e $BUILD
""")]
matrix = [] matrix = []
cfg['matrix'] = {'include': matrix} cfg['matrix'] = {'include': matrix}
@ -30,7 +41,7 @@ cfg['matrix'] = {'include': matrix}
for python in ("2.7", "3.3", "3.4", "3.5", "pypy"): for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
matrix.append({ matrix.append({
'python': python, 'python': python,
'env': 'BUILD=style' 'env': 'BUILD=style BUILD_PRS=true'
}) })
if python == "3.5": if python == "3.5":
@ -54,14 +65,22 @@ for python in ("2.7", "3.3", "3.4", "3.5", "pypy"):
), ),
("devel", "release", "minimal") ("devel", "release", "minimal")
): ):
build_prs = (
python == "3.5" and
server_type == 'DAV' and
server == 'radicale'
)
matrix.append({ matrix.append({
'python': python, 'python': python,
'env': ("BUILD=test " 'env': ("BUILD=test "
"{server_type}_SERVER={server} " "{server_type}_SERVER={server} "
"REQUIREMENTS={requirements}" "REQUIREMENTS={requirements} "
"BUILD_PRS={build_prs}"
.format(server_type=server_type, .format(server_type=server_type,
server=server, server=server,
requirements=requirements)) requirements=requirements,
build_prs='true' if build_prs else 'false'))
}) })
matrix.append({ matrix.append({

3
scripts/travis-install.sh
View file

@ -24,6 +24,3 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
virtualenv -p python3 $HOME/osx-py3 virtualenv -p python3 $HOME/osx-py3
. $HOME/osx-py3/bin/activate . $HOME/osx-py3/bin/activate
fi fi
pip install -U pip
pip install wheel