mirror of
https://github.com/CoolProp/CoolProp.git
synced 2026-04-23 03:00:17 -04:00
updated source activate command
This commit is contained in:
@@ -128,11 +128,11 @@ def python_slave(key, platform, conda_env, cmake_args = [], cmake_env = {}, buil
|
||||
else:
|
||||
source = ''
|
||||
|
||||
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
|
||||
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"&&","cmake", "..", "-DCOOLPROP_PYTHON_"+key+"=ON"]+cmake_args,
|
||||
env = cmake_env,
|
||||
workdir= working_folder,
|
||||
haltOnFailure = True))
|
||||
factory.addStep(ShellCommand(command=["activate",conda_env,"cmake", "--build", ".", "--target", "CoolProp"]+build_args, workdir = working_folder, haltOnFailure = True))
|
||||
factory.addStep(ShellCommand(command=[source, "activate",conda_env,"&&","cmake", "--build", ".", "--target", "CoolProp"]+build_args, workdir = working_folder, haltOnFailure = True))
|
||||
factory.addStep(DirectoryUpload(slavesrc="install_root", masterdest="public_html/binaries", url="binaries", compress="bz2"))
|
||||
|
||||
return factory
|
||||
|
||||
Reference in New Issue
Block a user