Merge pull request #106 from danrmiller/submodule

clone recursively because PR# 2133 adds a submodule for libunbound
This commit is contained in:
luigi1111 2017-09-14 12:15:45 -04:00 committed by GitHub
commit f7fbc75d97

View file

@ -177,11 +177,11 @@ from buildbot.status.results import FAILURE, SUCCESS
# BUILD FACTORIES
noTestsFactory = util.BuildFactory()
noTestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
noTestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
noTestsFactory.addStep(steps.Compile(command = ['make', 'release-static']))
noCoretestsFactory = util.BuildFactory()
noCoretestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
noCoretestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
noCoretestsFactory.addStep(steps.Compile(command = ['make', 'release-static']))
noCoretestsFactory.addStep(steps.Test(command = ['make', 'release-test'], timeout=None, env={'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={'LastTest': 'build/release/Testing/Temporary/LastTest.log','CTestCostData.txt': 'build/release/Testing/Temporary/CTestCostData.txt'}))
noCoretestsFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
@ -189,7 +189,7 @@ noCoretestsFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-
noCoretestsFactory.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")))
ispHijackedFactory = util.BuildFactory()
ispHijackedFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
ispHijackedFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
ispHijackedFactory.addStep(steps.Compile(command = ['make', 'release-static']))
ispHijackedFactory.addStep(steps.Test(command = ['make', 'release-test'], timeout=None, env={'ARGS': " -E 'coretests|libwallet_api_tests' ", 'GTEST_FILTER': '-DNSResolver.*:AddressFromURL.*'}, logfiles={'LastTest': 'build/release/Testing/Temporary/LastTest.log','CTestCostData.txt': 'build/release/Testing/Temporary/CTestCostData.txt'}))
ispHijackedFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
@ -197,25 +197,25 @@ ispHijackedFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-
ispHijackedFactory.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")))
osxTestsFactory = util.BuildFactory()
osxTestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental'))
osxTestsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental', submodules=True))
osxTestsFactory.addStep(steps.Test(command = ['make', 'release-test'], timeout=None, logfiles={'LastTest.log': 'build/debug/Testing/Temporary/LastTest.log','CTestCostData.txt': 'build/debug/Testing/Temporary/CTestCostData.txt','coretests.log': 'build/debug/tests/core_tests/coretests.log'}))
armv8Factory = util.BuildFactory()
armv8Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
armv8Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
armv8Factory.addStep(steps.Compile(command = ['make', 'release-static-armv8']))
armv8Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
armv8Factory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] ))
armv8Factory.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")))
armv7Factory = util.BuildFactory()
armv7Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental'))
armv7Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental', submodules=True))
armv7Factory.addStep(steps.Compile(command = ['ccache', 'make', 'release-static-armv7'], timeout=None))
armv7Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
armv7Factory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] ))
armv7Factory.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")))
static32Factory = util.BuildFactory()
static32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
static32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
static32Factory.addStep(steps.Compile(command = ['make', 'release-static-32']))
static32Factory.addStep(steps.Test(command = ['make', 'release-test'], timeout=None, env={'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={"LastTest": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt"}))
static32Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
@ -223,12 +223,12 @@ static32Factory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcv
static32Factory.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")))
win32ReleaseFactory = util.BuildFactory()
win32ReleaseFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
win32ReleaseFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
win32ReleaseFactory.addStep(steps.Compile(command = ["make", "release-static-win32"]))
win32ReleaseFactory.addStep(steps.Test(command = ["make", "release-test"], env={'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={"LastTest": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt"}))
win64ReleaseFactory = util.BuildFactory()
win64ReleaseFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
win64ReleaseFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
win64ReleaseFactory.addStep(steps.Compile(command = ["make", "release-static-win64"]))
win64ReleaseFactory.addStep(steps.Test(command = ["make", "release-test"], env={'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={"LastTest": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt"}))
win64ReleaseFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
@ -236,7 +236,7 @@ win64ReleaseFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "
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.Git(repourl='https://github.com/monero-project/monero.git', mode='full', submodules=True))
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'))
@ -244,11 +244,11 @@ dragonflyFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zc
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.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', submodules=True))
coreFactory.addStep(steps.Compile(command = ["bash", "-ex", "build.sh"], timeout=None))
coreOsxFactory = util.BuildFactory()
coreOsxFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full'))
coreOsxFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', submodules=True))
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-wallet-gui.app/Contents/Frameworks/']))
@ -262,12 +262,12 @@ coreOsxFactory.addStep(steps.ShellCommand(name = "zip", command = ["zip", "-r",
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'))
coreFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='incremental', submodules=True))
coreFreebsdFactory.addStep(steps.Compile(command = ["bash", "-ex", "build.sh"],env={'SHELL': '/usr/local/bin/bash', 'PATH': '/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/home/vagrant/bin:/usr/local/lib/qt5/bin'}))
coreMingw32Factory = util.BuildFactory()
coreMingw32Factory.addStep(steps.RemoveDirectory(dir='monero'))
coreMingw32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', method='clobber'))
coreMingw32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', method='clobber', submodules=True))
coreMingw32Factory.addStep(steps.Compile(command = ['/msys32/usr/bin/bash.exe', '-ex', './build.sh'],env={'MSYSTEM': 'MINGW32', 'PATH': '/c/Windows/system32;/c/Windows;/c/Windows/System32/WindowsPowerShell/v1.0;/c/Qt/Qt5.7.0/Tools/mingw530_32/bin;/c/Qt/Qt5.7.0/Tools/mingw530_32/boost/lib;/c/Qt/Qt5.7.0/5.7/mingw53_32/bin;/c/python27/lib/site-packages/pywin32_system32;/c/msys32/mingw32/bin;/c/msys32/usr/bin'}))
coreMingw32Factory.addStep(steps.Compile(name='deploy', description='deploying', descriptionDone='deploy', command = ['make', 'deploy'], workdir='build/build', env={'MSYSTEM': 'MINGW32', 'PATH': '/c/Python27;/c/Python27/Scripts;/c/Windows/system32;/c/Windows;/c/Qt/Qt5.7.0/Tools/mingw530_32/bin;/c/Qt/Qt5.7.0/Tools/mingw530_32/boost/lib;/c/Qt/Qt5.7.0/5.7/mingw53_32/bin;/c/python27/lib/site-packages/pywin32_system32;/c/msys32/mingw32/bin;/msys32/usr/bin'}))
coreMingw32Factory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
@ -276,7 +276,7 @@ coreMingw32Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-core
coreMingw64Factory = util.BuildFactory()
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.Git(repourl='https://github.com/monero-project/monero-core.git', mode='incremental', submodules=True))
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'))
@ -359,7 +359,7 @@ kovriStaticWin64Factory.addStep(steps.FileUpload(name="upload hashes", slavesrc=
coreUbuntu64Factory = util.BuildFactory()
coreUbuntu64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full'))
coreUbuntu64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', submodules=True))
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'))
@ -368,7 +368,7 @@ coreUbuntu64Factory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-cor
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.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full', submodules=True))
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'))
@ -376,22 +376,22 @@ coreDebianFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-z
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'))
testsFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='incremental', submodules=True))
testsFactory.addStep(steps.Compile(command = ["make", "debug"]))
testsFactory.addStep(steps.Test(command = ["make", "debug-test"], timeout=None, logfiles={"LastTest.log": "build/debug/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/debug/Testing/Temporary/CTestCostData.txt","coretests.log": "build/debug/tests/core_tests/coretests.log"}))
testsFreebsdFactory = util.BuildFactory()
testsFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber"))
testsFreebsdFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber", submodules=True))
testsFreebsdFactory.addStep(steps.Compile(command = ["make", "release-static"]))
testsFreebsdFactory.addStep(steps.Test(command = ["make", "release-test"], timeout=None, logfiles={"LastTest.log": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt","coretests.log": "build/release/tests/core_tests/coretests.log"}))
testsWin32Factory = util.BuildFactory()
testsWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber"))
testsWin32Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber", submodules=True))
testsWin32Factory.addStep(steps.Compile(command = ["make", "release-static-win32"]))
testsWin32Factory.addStep(steps.Test(command = ["make", "release-test"], timeout=None, logfiles={"LastTest.log": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt"}))
testsWin64Factory = util.BuildFactory()
testsWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber"))
testsWin64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full', method="clobber", submodules=True))
testsWin64Factory.addStep(steps.Compile(command = ["make", "release-static-win64"]))
testsWin64Factory.addStep(steps.Test(command = ["make", "release-test"], timeout=None, logfiles={"LastTest.log": "build/release/Testing/Temporary/LastTest.log","CTestCostData.txt": "build/release/Testing/Temporary/CTestCostData.txt"}))