mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 23:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow build --force and --test to work even when using a build server

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-09-27 19:58:03 +01:00
parent a0d5423109
commit 8d224bde84
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
fdroidserver/build.py
View file

@ -33,7 +33,8 @@ from common import BuildException
from common import VCSException from common import VCSException
def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path): # Note that 'force' here also implies test mode.
def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
"""Do a build on the build server.""" """Do a build on the build server."""
import ssh import ssh
@ -217,8 +218,11 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path):
chan = sshs.get_transport().open_session() chan = sshs.get_transport().open_session()
stdoutf = chan.makefile('r') stdoutf = chan.makefile('r')
stderrf = chan.makefile_stderr('r') stderrf = chan.makefile_stderr('r')
chan.exec_command('python build.py --on-server -p ' + cmdline = 'python build.py --on-server'
app['id'] + ' --vercode ' + thisbuild['vercode']) if force:
cmdline += ' --force --test'
cmdline += ' -p ' + app['id'] + ' --vercode ' + thisbuild['vercode']
chan.exec_command(cmdline)
output = '' output = ''
error = '' error = ''
while not chan.exit_status_ready(): while not chan.exit_status_ready():
@ -229,7 +233,10 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path):
raise BuildException("Build.py failed on server for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip()) raise BuildException("Build.py failed on server for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip())
# Retrieve the built files... # Retrieve the built files...
ftp.chdir('/home/vagrant/unsigned') if(force):
ftp.chdir('/home/vagrant/tmp')
else:
ftp.chdir('/home/vagrant/unsigned')
apkfile = app['id'] + '_' + thisbuild['vercode'] + '.apk' apkfile = app['id'] + '_' + thisbuild['vercode'] + '.apk'
tarball = app['id'] + '_' + thisbuild['vercode'] + '_src' + '.tar.gz' tarball = app['id'] + '_' + thisbuild['vercode'] + '_src' + '.tar.gz'
try: try:
@ -436,7 +443,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, extlib_dir, tmp_dir,
# grabbing the source now. # grabbing the source now.
vcs.gotorevision(thisbuild['commit']) vcs.gotorevision(thisbuild['commit'])
build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path) build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force)
else: else:
build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force, verbose) build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, install, force, verbose)
return True return True