Merge branch 'master' into kovri-packaging

This commit is contained in:
Dan Miller 2017-06-10 20:41:08 -07:00 committed by GitHub
commit 2f44592d5b

View file

@ -134,6 +134,15 @@ c['schedulers'].append(schedulers.Nightly(
change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git'),
onlyIfChanged=True))
c['schedulers'].append(schedulers.Nightly(
name='Kovri Nightly',
branch='master',
builderNames=['kovri-static-dragonflybsd-amd64','kovri-static-win32','kovri-static-win64','kovri-static-freebsd64','kovri-static-osx','kovri-static-ubuntu-amd64','kovri-static-ubuntu-i686','kovri-static-ubuntu-arm7','kovri-static-debian-arm8'],
hour=6,
minute=0,
change_filter=util.ChangeFilter(repository='https://github.com/monero-project/kovri.git'),
onlyIfChanged=False))
c['schedulers'].append(schedulers.Nightly(
name='Monero Nightly',
branch='master',
@ -347,6 +356,7 @@ kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='
kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip")))
kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.zip.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.zip.sha256sum.txt")))
coreUbuntu64Factory = util.BuildFactory()
coreUbuntu64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full'))
coreUbuntu64Factory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"], env={'PATH': '/opt/Qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'}))