github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved the permission handling to the builders instead of the cron task, finally fixes #613

Browse Source
This commit is contained in:
Jorrit Wronski
2015-04-22 13:04:33 +02:00
parent a59d38c485
commit 7abfdd2917
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dev/buildbot/master/master.cfg
View File

@@ -257,6 +257,11 @@ def masterdestLocation(props):
else:
return 'public_html/unstable'
############# Upload folder permissions #######################
def fixPermission(factory):
factory.addStep(MasterShellCommand(command = '${HOME}/scripts/binPerms.sh'))
# A centralised method to provide the objects with some presets
def getBaseFactory(gitMode = 'incremental'):
factory = BuildFactory()
@@ -368,6 +373,7 @@ def pythonFactory(pyID, pyCFG=PythonSlaveConfig("name"), gitMode='incremental'):
#
if not checkID(pyID, teID=300, strict=False): # Only upload non-Linux files
factory.addStep(DirectoryUpload(slavesrc=uploadFolder, masterdest=masterdestLocation, url="binaries", compress="bz2"))
fixPermission(factory)
return factory
@@ -486,7 +492,7 @@ def javascript_slave(platform, cmake_args = [], cmake_env = {}, build_args = [],
haltOnFailure = True))
factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install"]+build_args, workdir = working_folder, haltOnFailure = True))
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest=masterdestLocation, url="binaries", compress="bz2"))
fixPermission(factory)
return factory
def python_source_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, build_args = [], gitMode = 'incremental'):
@@ -504,6 +510,7 @@ def python_source_slave(key, platform, conda_env, cmake_args = [], cmake_env = {
workdir= working_folder,
haltOnFailure = True))
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest=masterdestLocation, url="binaries", compress="bz2"))
fixPermission(factory)
return factory
# def deb_slave(gitMode = 'incremental'):
@@ -565,6 +572,7 @@ def excel_slave(gitMode = 'incremental'):
factory.addStep(ShellCommand(command=["copy", "wrappers\Excel\TestExcel.xlsx", "bin\MicrosoftExcel"], workdir = 'build', haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="bin",masterdest=masterdestLocation,url="MicrosoftExcel",compress="bz2"))
fixPermission(factory)
return factory
def smath_builder(gitMode = 'incremental'):
@@ -611,6 +619,7 @@ def smath_builder(gitMode = 'incremental'):
factory.addStep(ShellCommand(command=["copy", "/Y", "wrappers\\SMath\\coolprop_wrapper\\coolprop_wrapper.7z", "bin\\SMath"], workdir = 'build', haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="bin",masterdest=masterdestLocation,url="SMath",compress="bz2"))
fixPermission(factory)
return factory
def julia_builder(gitMode = 'incremental'):
@@ -627,6 +636,7 @@ def julia_builder(gitMode = 'incremental'):
factory.addStep(ShellCommand(command=["cp", "wrappers/Julia/CoolProp.jl", "install_root/Julia/"], workdir = 'build', haltOnFailure = True))
# Upload the files - TODO: Is this the correct directory?
factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2"))
fixPermission(factory)
return factory
def cmake_slave(mod_name, platform, gitMode = 'incremental', install = True, cmake_args = [], build_args = [], ctest_args = [], cmake_env={}, test = True):
@@ -671,6 +681,7 @@ def cmake_slave(mod_name, platform, gitMode = 'incremental', install = True, cma
factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = working_folder, haltOnFailure = True))
if install:
factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2"))
fixPermission(factory)
return factory
def swig_matlab_builder(platform, gitMode = 'incremental', build_args = [], cmake_args = [], ctest_args = [], cmake_env = None):
@@ -712,6 +723,7 @@ def swig_matlab_builder(platform, gitMode = 'incremental', build_args = [], cmak
factory.addStep(ShellCommand(command=["ctest", "--extra-verbose"] + ctest_args, workdir = "build/build", haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2"))
fixPermission(factory)
# Return the object
return factory
@@ -749,6 +761,7 @@ def swig_scilab_builder(platform, gitMode = 'incremental'):
haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="install_root",masterdest=masterdestLocation,url="binaries",compress="bz2"))
fixPermission(factory)
return factory
def SWIG_MATLAB_bin_builder(platform, gitMode = 'incremental', windows = False):
@@ -832,6 +845,7 @@ def vxworks_module_builder(gitMode = 'incremental', cmake_args = [], cmake_env =
factory.addStep(ShellCommand(command = 'cmake --build . --target install', workdir = 'build/build', haltOnFailure = True))
# Upload the files
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest=masterdestLocation,url="binaries",compress="bz2"))
fixPermission(factory)
return factory
from buildbot.config import BuilderConfig
@@ -1118,7 +1132,7 @@ c['builders'].append(
factory = cmake_slave('32BIT_STDCALL_SHARED_LIBRARY',
test = False,
platform = 'windows',
cmake_args=['-DCOOLPROP_SHARED_LIBRARY=ON','-DCOOLPROP_STDCALL_LIBRARY=ON','-DCOOLPROP_LIBRARY_EXPORTS="CoolPropLib.def"'
cmake_args=['-DCOOLPROP_SHARED_LIBRARY=ON','-DCOOLPROP_STDCALL_LIBRARY=ON','-DCOOLPROP_LIBRARY_EXPORTS="CoolPropLib.def"',
'-G','"Visual Studio 10 2010"'],
build_args = ['--config','Release']
)