mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
Merge branch 'status_only_on_build' into 'master'
Write build/status.json only on build See merge request fdroid/fdroidserver!1210
This commit is contained in:
commit
7a40e5f6d5
@ -400,6 +400,8 @@ fdroid build:
|
|||||||
|
|
||||||
# each `fdroid build --on-server` run expects sudo, then uninstalls it
|
# each `fdroid build --on-server` run expects sudo, then uninstalls it
|
||||||
- if dpkg --list sudo; then echo "sudo should not be still there"; exit 1; fi
|
- if dpkg --list sudo; then echo "sudo should not be still there"; exit 1; fi
|
||||||
|
- 'if [ ! -f repo/status/running.json ]; then echo "ERROR: running.json does not exist!"; exit 1; fi'
|
||||||
|
- 'if [ ! -f repo/status/build.json ]; then echo "ERROR: build.json does not exist!"; exit 1; fi'
|
||||||
|
|
||||||
|
|
||||||
# test the plugin API and specifically the fetchsrclibs plugin, which
|
# test the plugin API and specifically the fetchsrclibs plugin, which
|
||||||
|
@ -877,6 +877,9 @@ def trybuild(app, build, build_dir, output_dir, log_dir, also_check_dir,
|
|||||||
logging.info("Building version %s (%s) of %s" % (
|
logging.info("Building version %s (%s) of %s" % (
|
||||||
build.versionName, build.versionCode, app.id))
|
build.versionName, build.versionCode, app.id))
|
||||||
|
|
||||||
|
if not onserver:
|
||||||
|
common.write_running_status_json(status_output)
|
||||||
|
|
||||||
if server:
|
if server:
|
||||||
# When using server mode, still keep a local cache of the repo, by
|
# When using server mode, still keep a local cache of the repo, by
|
||||||
# grabbing the source now.
|
# grabbing the source now.
|
||||||
@ -1070,6 +1073,9 @@ def main():
|
|||||||
app['Builds'] = [build]
|
app['Builds'] = [build]
|
||||||
break
|
break
|
||||||
|
|
||||||
|
if not options.onserver:
|
||||||
|
common.write_running_status_json(status_output)
|
||||||
|
|
||||||
# Build applications...
|
# Build applications...
|
||||||
failed_builds = []
|
failed_builds = []
|
||||||
build_succeeded = []
|
build_succeeded = []
|
||||||
@ -1105,7 +1111,6 @@ def main():
|
|||||||
tools_version_log = ''
|
tools_version_log = ''
|
||||||
if not options.onserver:
|
if not options.onserver:
|
||||||
tools_version_log = common.get_android_tools_version_log()
|
tools_version_log = common.get_android_tools_version_log()
|
||||||
common.write_running_status_json(status_output)
|
|
||||||
try:
|
try:
|
||||||
|
|
||||||
# For the first build of a particular app, we need to set up
|
# For the first build of a particular app, we need to set up
|
||||||
|
Loading…
Reference in New Issue
Block a user