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

Use travis' new conditional branches (#670)

Browse source 
See https://github.com/travis-ci/travis-ci/issues/2778#issuecomment-329968553
See https://docs.travis-ci.com/user/conditional-builds-stages-jobs/#Conditional-Jobs
This commit is contained in:
Markus Unterwaditzer 2017-09-23 13:55:30 +02:00 committed by GitHub
parent 18a4f93c97
commit e2583ededf
2 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
.travis.yml
View file

@ -17,142 +17,145 @@
"matrix": { "matrix": {
"include": [ "include": [
{ {
"env": "BUILD=style BUILD_PRS=true", "env": "BUILD=style",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.3" "python": "3.3"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.4" "python": "3.4"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
"python": "3.5" "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" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.5" "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" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.5" "python": "3.5"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=devel ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=owncloud REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=nextcloud REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=baikal REQUIREMENTS=release ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release BUILD_PRS=false ", "env": "BUILD=test DAV_SERVER=davical REQUIREMENTS=release ",
"if": "NOT (type IN (pull_request))",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=icloud REQUIREMENTS=release BUILD_PRS=false ", "env": "BUILD=test DAV_SERVER=icloud REQUIREMENTS=release ",
"if": "NOT (type IN (pull_request))",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release BUILD_PRS=false ", "env": "BUILD=test DAV_SERVER=fastmail REQUIREMENTS=release ",
"if": "NOT (type IN (pull_request))",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal BUILD_PRS=true ", "env": "BUILD=test DAV_SERVER=xandikos REQUIREMENTS=minimal ",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest BUILD_PRS=true ", "env": "BUILD=test ETESYNC_TESTS=true REQUIREMENTS=latest",
"python": "3.6" "python": "3.6"
}, },
{ {
"env": "BUILD=test BUILD_PRS=true", "env": "BUILD=test",
"language": "generic", "language": "generic",
"os": "osx" "os": "osx"
} }
] ]
}, },
"script": [ "script": [
"\nif [ \"$TRAVIS_PULL_REQUEST\" = \"false\" ] || [ \"$BUILD_PRS\" != \"false\" ];\nthen make -e $BUILD;\nfi" "make -e $BUILD"
], ],
"sudo": true "sudo": true
} }

29
scripts/make_travisconf.py
View file

@ -28,19 +28,14 @@ make -e install-dev;
make -e install-$BUILD; make -e install-$BUILD;
"""] """]
script = """ cfg['script'] = ["make -e $BUILD"]
if [ "$TRAVIS_PULL_REQUEST" = "false" ] || [ "$BUILD_PRS" != "false" ];
then {};
fi""".format
cfg['script'] = [script("make -e $BUILD")]
matrix = [] matrix = []
cfg['matrix'] = {'include': matrix} cfg['matrix'] = {'include': matrix}
matrix.append({ matrix.append({
'python': latest_python, 'python': latest_python,
'env': 'BUILD=style BUILD_PRS=true' 'env': 'BUILD=style'
}) })
@ -53,30 +48,32 @@ for python, requirements in itertools.product(python_versions,
"fastmail") "fastmail")
for dav_server in dav_servers: for dav_server in dav_servers:
build_prs = dav_server not in ("fastmail", "davical", "icloud") job = {
matrix.append({
'python': python, 'python': python,
'env': ("BUILD=test " 'env': ("BUILD=test "
"DAV_SERVER={dav_server} " "DAV_SERVER={dav_server} "
"REQUIREMENTS={requirements} " "REQUIREMENTS={requirements} "
"BUILD_PRS={build_prs} "
.format(dav_server=dav_server, .format(dav_server=dav_server,
requirements=requirements, requirements=requirements))
build_prs=build_prs and "true" or "false")) }
})
build_prs = dav_server not in ("fastmail", "davical", "icloud")
if not build_prs:
job['if'] = 'NOT (type IN (pull_request))'
matrix.append(job)
matrix.append({ matrix.append({
'python': latest_python, 'python': latest_python,
'env': ("BUILD=test " 'env': ("BUILD=test "
"ETESYNC_TESTS=true " "ETESYNC_TESTS=true "
"REQUIREMENTS=latest " "REQUIREMENTS=latest")
"BUILD_PRS=true ")
}) })
matrix.append({ matrix.append({
'language': 'generic', 'language': 'generic',
'os': 'osx', 'os': 'osx',
'env': 'BUILD=test BUILD_PRS=true' 'env': 'BUILD=test'
}) })
json.dump(cfg, sys.stdout, sort_keys=True, indent=2) json.dump(cfg, sys.stdout, sort_keys=True, indent=2)