From 022547e4603b9aa64a4cceb63bac6838cde88b5e Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Mon, 13 Mar 2017 15:34:16 -0700 Subject: [PATCH 1/6] static builds and packaging for kovri add schedulers for kovri static builds --- buildbot/master/master.cfg | 91 +++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 4ad5212..d19c44a 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -91,7 +91,7 @@ from buildbot.plugins import schedulers c['schedulers'].append(schedulers.ForceScheduler( name='force', - builderNames=['monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) + builderNames=['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','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) c['schedulers'].append(schedulers.SingleBranchScheduler( name='monero PR builder', @@ -112,6 +112,15 @@ c['schedulers'].append(schedulers.SingleBranchScheduler( change_filter=util.ChangeFilter(repository='https://github.com/monero-project/kovri.git') )) +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='Tests', branch='master', @@ -286,6 +295,42 @@ kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make", kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) kovriMingw64Factory.addStep(steps.Test(name="banchmark", command=["kovri-benchmarks.exe"], workdir="build/build")) +kovriStaticFactory = util.BuildFactory() +kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"])) +kovriStaticFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) + +kovriStaticFreebsdFactory = util.BuildFactory() +kovriStaticFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticFreebsdFactory.addStep(steps.Compile(command=["gmake", "release-static"], env={'CC': 'clang38', 'CXX': 'clang++38'})) +kovriStaticFreebsdFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticFreebsdFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticFreebsdFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) + +kovriStaticDragonflyFactory = util.BuildFactory() +kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"])) +kovriStaticDragonflyFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticDragonflyFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) +kovriStaticDragonflyFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) + +kovriStaticWin32Factory = util.BuildFactory() +kovriStaticWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticWin32Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW32"})) +#kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash.exe', '-x', './pkg/kovri-install.sh', '-p', '-c'])) +kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticWin32Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticWin32Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) + +kovriStaticWin64Factory = util.BuildFactory() +kovriStaticWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticWin64Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW64"})) +kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys64\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.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'})) @@ -631,6 +676,50 @@ c['builders'].append( slavenames=["arm8"], factory=testsFactory)) +c['builders'].append( + util.BuilderConfig(name="kovri-static-ubuntu-i686", + slavenames=["linux-i386"], + factory=kovriStaticFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-osx", + slavenames=["osx-10.10"], + factory=kovriStaticFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-ubuntu-amd64", + slavenames=["linux-amd64"], + factory=kovriStaticFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-ubuntu-arm7", + slavenames=["arm7"], + factory=kovriStaticFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-debian-arm8", + slavenames=["arm8"], + factory=kovriStaticFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-dragonflybsd-amd64", + slavenames=["dragonfly-4.6"], + factory=kovriStaticDragonflyFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-freebsd64", + slavenames=["freebsd64"], + factory=kovriStaticFreebsdFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-win32", + slavenames=["win32"], + factory=kovriStaticWin32Factory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-win64", + slavenames=["win64"], + factory=kovriStaticWin64Factory)) # STATUS TARGETS From 793f233cb1d99844cd93d0aa2cbed5ac213182bb Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Thu, 9 Mar 2017 17:46:53 -0800 Subject: [PATCH 2/6] add dragonflybsd builders --- buildbot/master/master.cfg | 77 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index d19c44a..58d040a 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -42,6 +42,10 @@ c['slaves'] = [ buildslave.BuildSlave('osx-10.12', secrets['osx-10.12'], max_builds=1, properties={'platform': 'osx-10.12'}), + buildslave.BuildSlave('dragonfly-4.6', secrets['dragonfly-4.6'], + max_builds=1, + properties={'platform': 'dragonfly-4.6'}), + ] c['protocols'] = {'pb': {'port': 9989}} @@ -91,24 +95,24 @@ from buildbot.plugins import schedulers c['schedulers'].append(schedulers.ForceScheduler( name='force', - builderNames=['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','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) + builderNames=['kovri-static-dragonflybsd-amd64', 'kovri-all-dragonflybsd-amd64', 'monero-snap','monero-core-android-armv7','monero-static-dragonflybsd-amd64','monero-static-netbsd-amd64','monero-static-openbsd-amd64','monero-android-armv7','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','pigeons-testing','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) c['schedulers'].append(schedulers.SingleBranchScheduler( name='monero PR builder', - builderNames=['monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'], + builderNames=['monero-static-dragonflybsd-amd64','monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'], change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git') )) c['schedulers'].append(schedulers.SingleBranchScheduler( name='monero-core PR builder', - builderNames=['monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-i686','monero-core-ubuntu-amd64','monero-core-win32','monero-core-win64','monero-core-ubuntu-arm7'], + builderNames=['monero-core-freebsd','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-i686','monero-core-ubuntu-amd64','monero-core-win32','monero-core-win64','monero-core-ubuntu-arm7','monero-core-debian-armv8'], change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero-core.git') )) c['schedulers'].append(schedulers.SingleBranchScheduler( name='kovri PR builder', fileIsImportant=startCompile, - builderNames=['kovri-all-win32','kovri-all-win64','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-amd64','kovri-all-ubuntu-i686','kovri-all-ubuntu-arm7','kovri-all-debian-arm8'], + builderNames=['kovri-all-dragonflybsd-amd64', 'kovri-all-win32','kovri-all-win64','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-amd64','kovri-all-ubuntu-i686','kovri-all-ubuntu-arm7','kovri-all-debian-arm8'], change_filter=util.ChangeFilter(repository='https://github.com/monero-project/kovri.git') )) @@ -130,6 +134,25 @@ 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', + builderNames=['monero-static-dragonflybsd-amd64','monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'], + hour=7, + minute=0, + change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git'), + onlyIfChanged=False)) + + # thanks m-labs https://github.com/m-labs/buildbot-config/blob/master/master.cfg def addCoverallsUploadSteps(factory, repo_token): factory.addStep( @@ -212,6 +235,14 @@ win64ReleaseFactory.addStep(steps.SetPropertyFromCommand(name = "set version", c win64ReleaseFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) win64ReleaseFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"))) +dragonflyFactory = util.BuildFactory() +dragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full')) +dragonflyFactory.addStep(steps.Compile(command = ['gmake', 'release-static'], env={'LDVER': 'ld.bfd'})) +dragonflyFactory.addStep(steps.Test(command = ['gmake', 'release-test'], timeout=None, env={'LDVER': 'ld.bfd', 'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={'LastTest': 'build/release/Testing/Temporary/LastTest.log','CTestCostData.txt': 'build/release/Testing/Temporary/CTestCostData.txt'})) +dragonflyFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) +dragonflyFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) +dragonflyFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"))) + coreFactory = util.BuildFactory() coreFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full')) coreFactory.addStep(steps.Compile(command = ["bash", "-ex", "build.sh"], timeout=None)) @@ -295,6 +326,7 @@ kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make", kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) kovriMingw64Factory.addStep(steps.Test(name="banchmark", command=["kovri-benchmarks.exe"], workdir="build/build")) +<<<<<<< 022547e4603b9aa64a4cceb63bac6838cde88b5e kovriStaticFactory = util.BuildFactory() kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"])) @@ -331,6 +363,20 @@ kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description=' kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) +||||||| merged common ancestors +======= +kovriDragonflyFactory = util.BuildFactory() +kovriDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriDragonflyFactory.addStep(steps.Compile(command=["gmake", "all-options"])) +kovriDragonflyFactory.addStep(steps.Compile(name="compile tests", command=["gmake", "tests"])) +kovriDragonflyFactory.addStep(steps.Test(command=["./build/kovri-tests"])) +kovriDragonflyFactory.addStep(steps.Test(name="benchmark", command=["./build/kovri-benchmarks"])) + +kovriStaticDragonflyFactory = util.BuildFactory() +kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"])) + +>>>>>>> add dragonflybsd builders 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'})) @@ -438,6 +484,15 @@ c['builders'].append( "github_repo_name": "monero", })) +c['builders'].append( + util.BuilderConfig(name="monero-static-dragonflybsd-amd64", + slavenames=["dragonfly-4.6"], + factory=dragonflyFactory, + properties={ + "github_repo_owner": "monero-project", + "github_repo_name": "monero", + })) + c['builders'].append( util.BuilderConfig(name="monero-static-osx-10.12", slavenames=["osx-10.12"], @@ -628,6 +683,15 @@ c['builders'].append( "github_repo_name": "kovri", })) +c['builders'].append( + util.BuilderConfig(name="kovri-all-dragonflybsd-amd64", + slavenames=["dragonfly-4.6"], + factory=kovriDragonflyFactory, + properties={ + "github_repo_owner": "monero-project", + "github_repo_name": "kovri", + })) + c['builders'].append( util.BuilderConfig(name="kovri-all-win32", slavenames=["win32"], @@ -646,6 +710,11 @@ c['builders'].append( "github_repo_name": "kovri", })) +c['builders'].append( + util.BuilderConfig(name="kovri-static-dragonflybsd-amd64", + slavenames=["dragonfly-4.6"], + factory=kovriStaticDragonflyFactory)) + c['builders'].append( util.BuilderConfig(name="monero-tests-ubuntu-16.04-i686", slavenames=["linux-i386"], From cccf136a3007adb2eeb6770e2a1d45306a460673 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Mon, 13 Mar 2017 09:00:09 -0700 Subject: [PATCH 3/6] remove kovri benchmarks --- buildbot/master/master.cfg | 6 ------ 1 file changed, 6 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 58d040a..68a626f 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -288,21 +288,18 @@ kovriAllFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kov kovriAllFactory.addStep(steps.Compile(command=["make", "all-options"])) kovriAllFactory.addStep(steps.Compile(name="compile tests", command=["make", "tests"])) kovriAllFactory.addStep(steps.Test(command=["./build/kovri-tests"])) -kovriAllFactory.addStep(steps.Test(name="benchmark", timeout=None, command=["./build/kovri-benchmarks"])) kovriArmFactory = util.BuildFactory() kovriArmFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriArmFactory.addStep(steps.Compile(command=["make", "all-options"], env={'CC': 'clang35', 'CXX': 'clang++35'})) kovriArmFactory.addStep(steps.Compile(name="compile tests", command=["make", "tests"], env={'CC': 'clang35', 'CXX': 'clang++35'})) kovriArmFactory.addStep(steps.Test(command=["./build/kovri-tests"])) -kovriArmFactory.addStep(steps.Test(name="benchmark", timeout=None, command=["./build/kovri-benchmarks"])) kovriUbuntu64Factory = util.BuildFactory() kovriUbuntu64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriUbuntu64Factory.addStep(steps.Compile(command=["make", "coverage"])) kovriUbuntu64Factory.addStep(steps.Compile(name="compile tests", command=["make", "coverage-tests"])) kovriUbuntu64Factory.addStep(steps.Test(command=["./build/kovri-tests"])) -kovriUbuntu64Factory.addStep(steps.Test(name="benchmark", command=["./build/kovri-benchmarks"])) addCoverallsUploadSteps(kovriUbuntu64Factory,repo_token=secrets['coveralls_token']) kovriFreebsdFactory = util.BuildFactory() @@ -310,21 +307,18 @@ kovriFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project kovriFreebsdFactory.addStep(steps.Compile(command=["gmake", "all-options"], env={'CC': 'clang36', 'CXX': 'clang++36'})) kovriFreebsdFactory.addStep(steps.Compile(name="compile tests", command=["gmake", "tests"], env={'CC': 'clang36', 'CXX': 'clang++36'})) kovriFreebsdFactory.addStep(steps.Test(command=["./build/kovri-tests"])) -kovriFreebsdFactory.addStep(steps.Test(name="benchmark", command=["./build/kovri-benchmarks"])) kovriMingw32Factory = util.BuildFactory() kovriMingw32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriMingw32Factory.addStep(steps.Compile(command=["/msys32/usr/bin/bash.exe","-c", "make", "all-options"],env={'MSYSTEM': "MINGW32"})) kovriMingw32Factory.addStep(steps.Compile(name="compile tests", command=["make", "tests"])) kovriMingw32Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) -kovriMingw32Factory.addStep(steps.Test(name="banchmark", command=["kovri-benchmarks.exe"], workdir="build/build")) kovriMingw64Factory = util.BuildFactory() kovriMingw64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriMingw64Factory.addStep(steps.Compile(command=["make", "all-options"],env={'MSYSTEM': "MINGW64"})) kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make", "tests"])) kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) -kovriMingw64Factory.addStep(steps.Test(name="banchmark", command=["kovri-benchmarks.exe"], workdir="build/build")) <<<<<<< 022547e4603b9aa64a4cceb63bac6838cde88b5e kovriStaticFactory = util.BuildFactory() From 4c1c9bf325f358ff75e9998cdb0fae12c3f6ef9f Mon Sep 17 00:00:00 2001 From: anonimal Date: Wed, 19 Apr 2017 02:34:53 +0000 Subject: [PATCH 4/6] Kovri: remove installer (moved to Kovri repo) This was moved to the Kovri repo in monero-project/kovri#583 --- kovri/install.sh | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100755 kovri/install.sh diff --git a/kovri/install.sh b/kovri/install.sh deleted file mode 100755 index 12dd1b5..0000000 --- a/kovri/install.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# TODO(unassigned): /bin/sh isn't smart enough - -# Trivial script to install binary/resources using the makeself installer -# Not to substitute real packaging (this is meant for nightly/branch-tip builds) - -case "$OSTYPE" in - linux*) - _data="$HOME/.kovri" - _path="$HOME/.bin" - ;; - darwin*) - _data="$HOME/Library/Application Support/Kovri" - _path="$HOME/Library/Desktop" - ;; - freebsd*) - _data="$HOME/.kovri" - _path="$HOME/bin" - ;; - msys) - _data="$APPDATA\\Kovri" - _path="$HOMEPATH\\Desktop" - ;; - *) - echo "Unsupported platform" - exit 1 - ;; -esac - -_backup="${_data}-$(date +%Y.%m.%d)" # TODO(anonimal): we'll probably want to backup using revision hash -_binary="kovri" - -# Create bin dir if needed -[ ! -d "$_path" ] && mkdir "$_path" - -# Create backup if needed -[ -d "$_data" ] && mv "$_data" "$_backup" && [ -f "${_path}/${_binary}" ] && mv "${_path}/${_binary}" "$_backup" - -# Move resources -mkdir "$_data" && mv $(ls -A . | grep -v $(basename "$0")) "$_data" && mv "${_data}/${_binary}" "$_path" - -if [ $? -ne 0 ]; then - echo "Failed to install. See above error messages" - exit 1 -fi - -echo "Kovri binary '$_binary' is in $_path" -echo "Consider adding $_path to your \$PATH" From b42fd1b2bdab2f56d5b195d2bb74a4045aef93dd Mon Sep 17 00:00:00 2001 From: Gingeropolous Date: Wed, 19 Apr 2017 15:48:29 -0400 Subject: [PATCH 5/6] Create FFS document that spells out everything explicitly. remove merge artifacts --- FFS | 20 ++++++++++++++++++++ buildbot/master/master.cfg | 4 ---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 FFS diff --git a/FFS b/FFS new file mode 100644 index 0000000..8947472 --- /dev/null +++ b/FFS @@ -0,0 +1,20 @@ +## Funding, work start, payments + +1. The project can begin before it's fully funded +2. Devs can be paid for milestone completion before it's fully funded +3. If the dev disappears, no problem, someone else can pick up from their last milestone +4. If the milestones are sufficiently small the dev doesn't have to go 6 months without pay + +## Ideal FFS Workflow + +1. An idea is presented in the **IDEAS** thread. A discussion occurs regarding whether the idea should be developed. +2. A developer (who either presented the idea, or saw the idea and realizes they can develop it) pitches their proposal to develop the idea in the **OPEN TASKS** section. At a minimum, this pitch should include + +**What** - describe the idea and how you plan to develop it +**Who** - who are you? Why do you think you can develop it, and why should the Monero community believe you can? +**Why** - Why do you want to develop this? +**The Proposal and Milestones** - It is difficult to describe how each proposal should be broken down into milestones, but only you (the developer) knows how long things can take, and knows how to break the task apart. +**Expiration** - Make it apparent that a time limit exists for the proposal. If the project is abandoned, funds will eventually be re-appropriated at the discretion of the core developers. At the minimum, development should start coding "soon" after the funding target has been met in order to avoid re-appropriation. + +3. The community discusses the proposal. The proposal is amended, etc. Eventually the community approves, and the proposal is moved to **FUNDING REQUIRED** by a moderator. Here, funding occurs. People may or may not post that they have contributed. It is not necessary to post your contributions, though it is fine. +4. Once fully funded, or development begins, the thread is moved to the **WORK IN PROGRESS* thread, where the developer is expected to provide some kind of activity report. diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 68a626f..d66e0fd 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -320,7 +320,6 @@ kovriMingw64Factory.addStep(steps.Compile(command=["make", "all-options"],env={' kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make", "tests"])) kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) -<<<<<<< 022547e4603b9aa64a4cceb63bac6838cde88b5e kovriStaticFactory = util.BuildFactory() kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"])) @@ -357,8 +356,6 @@ kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description=' kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) -||||||| merged common ancestors -======= kovriDragonflyFactory = util.BuildFactory() kovriDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriDragonflyFactory.addStep(steps.Compile(command=["gmake", "all-options"])) @@ -370,7 +367,6 @@ kovriStaticDragonflyFactory = util.BuildFactory() kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"])) ->>>>>>> add dragonflybsd builders 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'})) From 2da454ea684465110434570c964bc8b09bcc8171 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Sat, 10 Jun 2017 20:33:17 -0700 Subject: [PATCH 6/6] kovri static builds --- buildbot/master/master.cfg | 89 ++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index d66e0fd..1d29290 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -95,7 +95,7 @@ from buildbot.plugins import schedulers c['schedulers'].append(schedulers.ForceScheduler( name='force', - builderNames=['kovri-static-dragonflybsd-amd64', 'kovri-all-dragonflybsd-amd64', 'monero-snap','monero-core-android-armv7','monero-static-dragonflybsd-amd64','monero-static-netbsd-amd64','monero-static-openbsd-amd64','monero-android-armv7','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','pigeons-testing','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) + builderNames=['kovri-static-openbsd-amd64', 'kovri-all-openbsd-amd64', 'kovri-static-dragonflybsd-amd64', 'kovri-all-dragonflybsd-amd64', 'monero-snap','monero-core-android-armv7','monero-static-dragonflybsd-amd64','monero-static-netbsd-amd64','monero-static-openbsd-amd64','monero-android-armv7','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','pigeons-testing','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12'])) c['schedulers'].append(schedulers.SingleBranchScheduler( name='monero PR builder', @@ -134,15 +134,6 @@ 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', @@ -320,42 +311,6 @@ kovriMingw64Factory.addStep(steps.Compile(command=["make", "all-options"],env={' kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make", "tests"])) kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build")) -kovriStaticFactory = util.BuildFactory() -kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"])) -kovriStaticFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) -kovriStaticFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) -kovriStaticFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) - -kovriStaticFreebsdFactory = util.BuildFactory() -kovriStaticFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticFreebsdFactory.addStep(steps.Compile(command=["gmake", "release-static"], env={'CC': 'clang38', 'CXX': 'clang++38'})) -kovriStaticFreebsdFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) -kovriStaticFreebsdFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) -kovriStaticFreebsdFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) - -kovriStaticDragonflyFactory = util.BuildFactory() -kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"])) -kovriStaticDragonflyFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) -kovriStaticDragonflyFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) -kovriStaticDragonflyFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) - -kovriStaticWin32Factory = util.BuildFactory() -kovriStaticWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticWin32Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW32"})) -#kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash.exe', '-x', './pkg/kovri-install.sh', '-p', '-c'])) -kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) -kovriStaticWin32Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) -kovriStaticWin32Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) - -kovriStaticWin64Factory = util.BuildFactory() -kovriStaticWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticWin64Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW64"})) -kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys64\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) -kovriStaticWin64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) -kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) - kovriDragonflyFactory = util.BuildFactory() kovriDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) kovriDragonflyFactory.addStep(steps.Compile(command=["gmake", "all-options"])) @@ -363,9 +318,34 @@ kovriDragonflyFactory.addStep(steps.Compile(name="compile tests", command=["gmak kovriDragonflyFactory.addStep(steps.Test(command=["./build/kovri-tests"])) kovriDragonflyFactory.addStep(steps.Test(name="benchmark", command=["./build/kovri-benchmarks"])) -kovriStaticDragonflyFactory = util.BuildFactory() -kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) -kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"])) +kovriStaticFactory = util.BuildFactory() +kovriStaticFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticFactory.addStep(steps.Compile(command=["make", "release-static"])) +kovriStaticFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='package', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) + +kovriStaticBsdFactory = util.BuildFactory() +kovriStaticBsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticBsdFactory.addStep(steps.Compile(command=["gmake", "release-static"])) +kovriStaticBsdFactory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.tar.bz2')])) +kovriStaticBsdFactory.addStep(steps.FileUpload(slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2"))) +kovriStaticBsdFactory.addStep(steps.FileUpload(name="upload hashes", slavesrc=WithProperties("kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"), url=WithProperties("https://build.getmonero.org/downloads/kovri-latest-%(platform)s.tar.bz2.sha256sum.txt"))) +kovriStaticBsdFactory.addStep(steps.RemoveDirectory(dir='build/build', hideStepIf=True)) + +kovriStaticWin32Factory = util.BuildFactory() +kovriStaticWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticWin32Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW32"})) +kovriStaticWin32Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys32\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')])) +kovriStaticWin32Factory.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"))) +kovriStaticWin32Factory.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"))) + +kovriStaticWin64Factory = util.BuildFactory() +kovriStaticWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) +kovriStaticWin64Factory.addStep(steps.Compile(command=["make", "release-static"],env={'MSYSTEM': "MINGW64"})) +kovriStaticWin64Factory.addStep(steps.ShellCommand(name='package', description='packaging', descriptionDone='packaged', env={'PATH': ["C:\msys64\usr\\bin\\core_perl", "${PATH}"]}, command = ['bash', '-x', './pkg/kovri-install.sh', '-p', '-c', '-f', util.Interpolate('kovri-latest-%(prop:platform)s.zip')])) +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')) @@ -763,12 +743,17 @@ c['builders'].append( c['builders'].append( util.BuilderConfig(name="kovri-static-dragonflybsd-amd64", slavenames=["dragonfly-4.6"], - factory=kovriStaticDragonflyFactory)) + factory=kovriStaticBsdFactory)) c['builders'].append( util.BuilderConfig(name="kovri-static-freebsd64", - slavenames=["freebsd64"], - factory=kovriStaticFreebsdFactory)) + slavenames=["freebsd64"], env={'CC': 'clang36', 'CXX': 'clang++36'}, + factory=kovriStaticBsdFactory)) + +c['builders'].append( + util.BuilderConfig(name="kovri-static-openbsd-amd64", + slavenames=["openbsd"], env={'CC': 'egcc', 'CXX': 'eg++'}, + factory=kovriStaticBsdFactory)) c['builders'].append( util.BuilderConfig(name="kovri-static-win32",