From cdf63bf2e701f330904411a2949862feaaa2c189 Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Thu, 19 Jul 2018 14:17:37 +0100 Subject: [PATCH] Do not upload non-master branch builds --- upload.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/upload.py b/upload.py index cc21c63..1c9e11e 100644 --- a/upload.py +++ b/upload.py @@ -18,6 +18,12 @@ def GITHash(): stdout = stdout.decode('UTF-8') return stdout.rstrip('\r\n') +def GITBranch(): + p = subprocess.Popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stdout = subprocess.PIPE, stderr = subprocess.PIPE) + (stdout, stderr) = p.communicate() + stdout = stdout.decode('UTF-8') + return stdout.rstrip('\r\n') + def GITVersion(): p = subprocess.Popen(['git', 'rev-list', '--count', '--first-parent', 'HEAD'], stdout = subprocess.PIPE, stderr = subprocess.PIPE) (stdout, stderr) = p.communicate() @@ -61,7 +67,7 @@ for zinfo in zip.infolist(): zip.close() -if 'ftp_hostname' in os.environ: +if 'ftp_hostname' in os.environ and GITBranch() == 'master': print('') ftp = ftplib.FTP(os.environ['ftp_hostname'], os.environ['ftp_username'], os.environ['ftp_password'])