Skip to content
Permalink
Browse files

cleanup + use commit-description in all buildsteps

  • Loading branch information
abma committed Dec 2, 2019
1 parent 73ad47b commit eaa4af43c0ff6f64c55cd2680144888455fd19eb
Showing with 3 additions and 43 deletions.
  1. +2 −42 buildbot/master.cfg
  2. +1 −1 tools/upload-build.py
@@ -181,46 +181,6 @@ class WindowsLocales(ShellCommand):
WithProperties("springlobby-" + base_rev + "%(buildnumber)s-win32.zip")]


class ReleaseWin(ShellCommand):
name = "release windows binary"
description = ["releasing windows binary"]
descriptionDone = ["windows binary release"]
command = ["/usr/bin/install", "-t", "/data/www/springlobby.info/windows/",
WithProperties("build-msw-default/springlobby-" + base_rev + "%(buildnumber)s-win32.zip")]


class ReleaseWinInstaller(ShellCommand):
name = "release windows installer"
description = ["releasing windows binary"]
descriptionDone = ["windows binary release"]
command = ["/usr/bin/install", "-t", "/data/www/springlobby.info/windows/",
WithProperties("build-msw-default/SpringLobby-" + base_rev + "%(buildnumber)s.exe")]


class ReleaseTarball(ShellCommand):
name = "release tarball"
description = ["releasing tarball"]
descriptionDone = ["tarball release"]
command = ["/usr/bin/install", "-t", "/data/www/springlobby.info/tarballs/",
WithProperties("build-msw-default/springlobby-" + base_rev + "%(buildnumber)s.tar.gz"),
WithProperties("build-msw-default/springlobby-" + base_rev + "%(buildnumber)s.tar.bz2")]


class GitTag(ShellCommand):
name = "git tag"
description = "git tagging"
descriptionDone = "git tag"
command = ["git", "tag", "-a", "-m", WithProperties(base_rev + "%(buildnumber)s"),
WithProperties(base_rev + "%(buildnumber)s")]


class LatestZip(ShellCommand):
name = "latest zip"
description = "latest zip"
descriptionDone = "latest zip"
command = ["tools/latest.sh", WithProperties(base_rev + "%(buildnumber)s")]


class PublishVersion(ShellCommand):
name = "publish version number"
description = "publishing version"
@@ -370,7 +330,7 @@ class CreateWinInstaller(ShellCommand):
self.description = ["creating dir %s" % (self.configname)]
self.descriptionDone = ["%s dir created" % (self.configname)]
self.command = ["installer/make_installer.sh",
WithProperties("build-msw-default/springlobby-" + base_rev + "%(buildnumber)s-win32.zip")]
WithProperties("build-msw-default/springlobby-%(commit-description)s-win32.zip")]

# common build config steps ---------------------------------------------@
JOBS = '-j2'
@@ -379,7 +339,7 @@ JOBS = '-j2'
class ReleaseFactory(BuildFactory):
def __init__(self):
BuildFactory.__init__(self)
self.addStep(Git(repourl=master_repo))
self.addStep(Git(repourl=master_repo, getDescription={"tags": True}))
self.addStep(SyncSubmodules())
self.addStep(InitSubmodules())
self.addStep(CreateBuildDir('msw-default'))
@@ -38,7 +38,7 @@

print("Rsync...")
try:
subprocess.check_output(["rsync", "-av", "--remove-source-files", outdir, "springlobby@springrts.com:/home/springlobby/www/" ], timeout = 600)
subprocess.check_output(["rsync", "-av", "--remove-source-files", outdir, "springlobby@springrts.com:/home/springlobby/www/dl/" ], timeout = 600)
except subprocess.CalledProcessError as e:
print(e.output)
raise e

0 comments on commit eaa4af4

Please sign in to comment.
You can’t perform that action at this time.