Skip to content

Commit 0cf3c0a

Browse files
committed
[irods/irods_development_environment#165] Add option to build with release packages
1 parent 86000d3 commit 0cf3c0a

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

irods_consortium_continuous_integration_build_hook.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import print_function
2-
31
import glob
42
import multiprocessing
53
import optparse
@@ -53,9 +51,12 @@ def copy_output_packages(build_directory, output_root_directory):
5351
irods_python_ci_utilities.append_os_specific_directory(output_root_directory),
5452
lambda s:s.endswith(irods_python_ci_utilities.get_package_suffix()))
5553

56-
def main(build_directory, output_root_directory, irods_packages_root_directory, externals_directory):
54+
def main(build_directory, output_root_directory, irods_packages_root_directory, externals_directory, irods_package_version):
5755
install_building_dependencies(externals_directory)
58-
if irods_packages_root_directory:
56+
if irods_package_version is not None:
57+
irods_python_ci_utilities.install_irods_packages_repository()
58+
irods_python_ci_utilities.install_released_irods_dev_and_runtime_packages(irods_package_version)
59+
elif irods_packages_root_directory:
5960
irods_python_ci_utilities.install_irods_dev_and_runtime_packages(irods_packages_root_directory)
6061
build_directory = os.path.abspath(build_directory or tempfile.mkdtemp(prefix='irods_python_rule_engine_plugin_build_directory'))
6162
irods_python_ci_utilities.subprocess_get_output(['cmake', os.path.dirname(os.path.realpath(__file__))], check_rc=True, cwd=build_directory)
@@ -69,9 +70,11 @@ def main(build_directory, output_root_directory, irods_packages_root_directory,
6970
parser.add_option('--output_root_directory')
7071
parser.add_option('--irods_packages_root_directory')
7172
parser.add_option('--externals_packages_directory')
73+
parser.add_option('--irods_package_version')
7274
options, _ = parser.parse_args()
7375

7476
main(options.build_directory,
7577
options.output_root_directory,
7678
options.irods_packages_root_directory,
77-
options.externals_packages_directory)
79+
options.externals_packages_directory,
80+
options.irods_package_version)

0 commit comments

Comments
 (0)