From afb8213b6645dc11f69b3177426a26dba4905f2e Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Thu, 15 Dec 2016 19:27:25 -0800 Subject: [PATCH 1/2] upload binaries --- buildbot/master/master.cfg | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 98fce47..4dcecb4 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -190,7 +190,17 @@ coreFactory.addStep(steps.Compile(command = ["bash", "-ex", "build.sh"])) coreOsxFactory = util.BuildFactory() coreOsxFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full')) -coreOsxFactory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"])) +coreOsxFactory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"], env={'PATH': '/opt/qt/Qt5.7.0/5.7/clang_64/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'})) +coreOsxFactory.addStep(steps.ShellCommand(command=['make', 'deploy'], name='deploy', description='deploying', workdir='build/build', env={'PATH': '/opt/qt/Qt5.7.0/5.7/clang_64/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'})) +coreOsxFactory.addStep(steps.ShellCommand(name='copy boost', command=['cp', '/usr/local/opt/boost/lib/libboost_system-mt.dylib', 'build/release/bin/monero-core.app/Contents/Frameworks/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy Qt', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/Qt', 'build/release/bin/monero-core.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy QtQuick', command=['cp', '-Rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtQuick', 'build/release/bin/monero-core.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy QtGraphicalEffects', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtGraphicalEffects', 'build/release/bin/monero-core.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy deps', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/lib/QtXmlPatterns.framework', 'build/release/bin/monero-core.app/Contents/Frameworks'])) +coreOsxFactory.addStep(steps.ShellCommand(name='link', command=['install_name_tool', '-change', '/usr/local/opt/openssl/1.0.2j/lib/libcrypto.1.0.0.dylib', '@executable_path/../Frameworks/libcrypto.1.0.0.dylib', 'build/release/bin/monero-core.app/Contents/Frameworks/libssl.1.0.0.dylib'])) +coreOsxFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) +coreOsxFactory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "-r", "-X", WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), "build/release/bin/monero-core.app"] )) +coreOsxFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.zip"))) coreFreebsdFactory = util.BuildFactory() coreFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='incremental')) @@ -206,8 +216,13 @@ coreMingw32Factory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "- coreMingw32Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.zip"))) coreMingw64Factory = util.BuildFactory() -coreMingw64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', method="clobber")) -coreMingw64Factory.addStep(steps.Compile(command = ["/msys64/usr/bin/bash.exe","-ex","./build.sh"],env={'MSYSTEM': "MINGW64"})) +coreMingw64Factory.addStep(steps.RemoveDirectory(dir='build/build')) +coreMingw64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='incremental')) +coreMingw64Factory.addStep(steps.Compile(command = ["/msys64/usr/bin/bash.exe","-ex","./build.sh"],env={'MSYSTEM': 'MINGW64', 'PATH': '/c/Qt/qt-everywhere-opensource-src-5.7.0/qtbase/bin;/c/msys64/usr/bin;/c/Windows/system32;/c/Windows;/c/msys64/mingw64/bin'})) +coreMingw64Factory.addStep(steps.Compile(name='deploy', description='deploying', descriptionDone='deploy', command = ['make', 'deploy'], workdir='build/build', env={'MSYSTEM_PREFIX': '/mingw64', 'MSYSTEM': 'MINGW64', 'PATH': ["c:\Qt\qt-everywhere-opensource-src-5.7.0\qtbase\\bin", "${PATH}"]})) +coreMingw64Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) +coreMingw64Factory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "-r", WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), "build/release/bin"] )) +coreMingw64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.zip"))) kovriAllFactory = util.BuildFactory() kovriAllFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True)) @@ -246,13 +261,18 @@ kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="bui 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"])) +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'})) coreUbuntu64Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) -coreUbuntu64Factory.addStep(steps.FileUpload(slavesrc="build/release/bin/monero-core", masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s"))) +coreUbuntu64Factory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) +coreUbuntu64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"))) coreDebianFactory = util.BuildFactory() +coreDebianFactory.addStep(steps.RemoveDirectory(dir='build/build')) coreDebianFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full')) coreDebianFactory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"])) +coreDebianFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) +coreDebianFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) +coreDebianFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"))) testsFactory = util.BuildFactory() testsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental')) From 9ee0e20b85b6cf37cb1ce37165f0e209c554a0d8 Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Tue, 20 Dec 2016 22:09:01 -0800 Subject: [PATCH 2/2] change name of mac binary, add deploy step to ubuntu --- buildbot/master/master.cfg | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg index 4dcecb4..6560457 100644 --- a/buildbot/master/master.cfg +++ b/buildbot/master/master.cfg @@ -192,15 +192,15 @@ coreOsxFactory = util.BuildFactory() coreOsxFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full')) coreOsxFactory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"], env={'PATH': '/opt/qt/Qt5.7.0/5.7/clang_64/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'})) coreOsxFactory.addStep(steps.ShellCommand(command=['make', 'deploy'], name='deploy', description='deploying', workdir='build/build', env={'PATH': '/opt/qt/Qt5.7.0/5.7/clang_64/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'})) -coreOsxFactory.addStep(steps.ShellCommand(name='copy boost', command=['cp', '/usr/local/opt/boost/lib/libboost_system-mt.dylib', 'build/release/bin/monero-core.app/Contents/Frameworks/'])) -coreOsxFactory.addStep(steps.ShellCommand(name='copy Qt', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/Qt', 'build/release/bin/monero-core.app/Contents/MacOS/'])) -coreOsxFactory.addStep(steps.ShellCommand(name='copy QtQuick', command=['cp', '-Rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtQuick', 'build/release/bin/monero-core.app/Contents/MacOS/'])) -coreOsxFactory.addStep(steps.ShellCommand(name='copy QtGraphicalEffects', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtGraphicalEffects', 'build/release/bin/monero-core.app/Contents/MacOS/'])) -coreOsxFactory.addStep(steps.ShellCommand(name='copy deps', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/lib/QtXmlPatterns.framework', 'build/release/bin/monero-core.app/Contents/Frameworks'])) -coreOsxFactory.addStep(steps.ShellCommand(name='link', command=['install_name_tool', '-change', '/usr/local/opt/openssl/1.0.2j/lib/libcrypto.1.0.0.dylib', '@executable_path/../Frameworks/libcrypto.1.0.0.dylib', 'build/release/bin/monero-core.app/Contents/Frameworks/libssl.1.0.0.dylib'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy boost', command=['cp', '/usr/local/opt/boost/lib/libboost_system-mt.dylib', 'build/release/bin/monero-wallet-gui.app/Contents/Frameworks/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy Qt', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/Qt', 'build/release/bin/monero-wallet-gui.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy QtQuick', command=['cp', '-Rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtQuick', 'build/release/bin/monero-wallet-gui.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy QtGraphicalEffects', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/qml/QtGraphicalEffects', 'build/release/bin/monero-wallet-gui.app/Contents/MacOS/'])) +coreOsxFactory.addStep(steps.ShellCommand(name='copy deps', command=['cp', '-rv', '/opt/qt/Qt5.7.0/5.7/clang_64/lib/QtXmlPatterns.framework', 'build/release/bin/monero-wallet-gui.app/Contents/Frameworks'])) +coreOsxFactory.addStep(steps.ShellCommand(name='link', command=['install_name_tool', '-change', '/usr/local/Cellar/openssl/1.0.2j/lib/libcrypto.1.0.0.dylib', '@executable_path/../Frameworks/libcrypto.1.0.0.dylib', 'build/release/bin/monero-wallet-gui.app/Contents/Frameworks/libssl.1.0.0.dylib'])) coreOsxFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) -coreOsxFactory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "-r", "-X", WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), "build/release/bin/monero-core.app"] )) -coreOsxFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.zip"))) +coreOsxFactory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "-r", "-X", WithProperties("monero-wallet-gui-%(gitversion)s-%(platform)s.zip"), "build/release/bin/monero-wallet-gui.app"] )) +coreOsxFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-wallet-gui-%(gitversion)s-%(platform)s.zip"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-wallet-gui-%(gitversion)s-%(platform)s.zip"), url=WithProperties("https://build.getmonero.org/downloads/monero-wallet-gui-%(gitversion)s-%(platform)s.zip"))) coreFreebsdFactory = util.BuildFactory() coreFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='incremental')) @@ -262,6 +262,7 @@ kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="bui 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'})) +coreUbuntu64Factory.addStep(steps.Compile(name='deploy', description='deploying', descriptionDone='deploy', command = ['make', 'deploy'],workdir='build/build')) coreUbuntu64Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) coreUbuntu64Factory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) coreUbuntu64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"))) @@ -270,6 +271,7 @@ coreDebianFactory = util.BuildFactory() coreDebianFactory.addStep(steps.RemoveDirectory(dir='build/build')) coreDebianFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full')) coreDebianFactory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"])) +coreDebianFactory.addStep(steps.Compile(name='deploy', description='deploying', descriptionDone='deploy', command = ['make', 'deploy'],workdir='build/build')) coreDebianFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion')) coreDebianFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] )) coreDebianFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-core-%(gitversion)s-%(platform)s.tar.gz")))