mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-04 22:40:12 +01:00
Log srclib errors during build to wiki and continue
This commit is contained in:
parent
cb16a63409
commit
6752665db7
@ -652,30 +652,38 @@ def main():
|
|||||||
m = max([i['vercode'] for i in app['builds']], key=int)
|
m = max([i['vercode'] for i in app['builds']], key=int)
|
||||||
app['builds'] = [b for b in app['builds'] if b['vercode'] == m]
|
app['builds'] = [b for b in app['builds'] if b['vercode'] == m]
|
||||||
|
|
||||||
|
if options.wiki:
|
||||||
|
import mwclient
|
||||||
|
site = mwclient.Site(wiki_server, path=wiki_path)
|
||||||
|
site.login(wiki_user, wiki_password)
|
||||||
|
|
||||||
# Build applications...
|
# Build applications...
|
||||||
failed_apps = {}
|
failed_apps = {}
|
||||||
build_succeeded = []
|
build_succeeded = []
|
||||||
for app in apps:
|
for app in apps:
|
||||||
|
|
||||||
if app['Repo Type'] == 'srclib':
|
first = True
|
||||||
build_dir = os.path.join('build', 'srclib')
|
|
||||||
else:
|
|
||||||
build_dir = os.path.join('build', app['id'])
|
|
||||||
|
|
||||||
# Set up vcs interface and make sure we have the latest code...
|
|
||||||
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
|
|
||||||
|
|
||||||
if app['Repo Type'] == 'srclib':
|
|
||||||
build_dir = os.path.join(build_dir, app['Repo'])
|
|
||||||
|
|
||||||
if options.wiki:
|
|
||||||
import mwclient
|
|
||||||
site = mwclient.Site(wiki_server, path=wiki_path)
|
|
||||||
site.login(wiki_user, wiki_password)
|
|
||||||
|
|
||||||
for thisbuild in app['builds']:
|
for thisbuild in app['builds']:
|
||||||
wikilog = None
|
wikilog = None
|
||||||
try:
|
try:
|
||||||
|
|
||||||
|
# For the first build of a particular app, we need to set up
|
||||||
|
# the source repo. We can reuse it on subsequent builds, if
|
||||||
|
# there are any.
|
||||||
|
if first:
|
||||||
|
if app['Repo Type'] == 'srclib':
|
||||||
|
build_dir = os.path.join('build', 'srclib')
|
||||||
|
else:
|
||||||
|
build_dir = os.path.join('build', app['id'])
|
||||||
|
|
||||||
|
# Set up vcs interface and make sure we have the latest code...
|
||||||
|
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
|
||||||
|
|
||||||
|
if app['Repo Type'] == 'srclib':
|
||||||
|
build_dir = os.path.join(build_dir, app['Repo'])
|
||||||
|
first = False
|
||||||
|
|
||||||
if trybuild(app, thisbuild, build_dir, output_dir, also_check_dir,
|
if trybuild(app, thisbuild, build_dir, output_dir, also_check_dir,
|
||||||
srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, options.test,
|
srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, options.test,
|
||||||
options.server, options.install, options.force,
|
options.server, options.install, options.force,
|
||||||
|
Loading…
Reference in New Issue
Block a user