diff --git a/metadata-ingestion-modules/airflow-plugin/build.gradle b/metadata-ingestion-modules/airflow-plugin/build.gradle index d895e29229c41..336be8fc94d44 100644 --- a/metadata-ingestion-modules/airflow-plugin/build.gradle +++ b/metadata-ingestion-modules/airflow-plugin/build.gradle @@ -25,8 +25,9 @@ task installPackage(type: Exec, dependsOn: environmentSetup) { // Workaround for https://github.com/yaml/pyyaml/issues/601. // See https://github.com/yaml/pyyaml/issues/601#issuecomment-1638509577. // and https://github.com/datahub-project/datahub/pull/8435. - commandLine 'bash', '-x', '-c', "${pip_install_command} install 'Cython<3.0' 'PyYAML<6' --no-build-isolation" - commandLine 'bash', '-x', '-c', "${pip_install_command} -e ." + commandLine 'bash', '-x', '-c', + "${pip_install_command} install 'Cython<3.0' 'PyYAML<6' --no-build-isolation && " + + "${pip_install_command} -e ." } task install(dependsOn: [installPackage]) diff --git a/metadata-ingestion/build.gradle b/metadata-ingestion/build.gradle index a1769df968fef..f636cf25c67f7 100644 --- a/metadata-ingestion/build.gradle +++ b/metadata-ingestion/build.gradle @@ -23,14 +23,17 @@ task checkPythonVersion(type: Exec) { task environmentSetup(type: Exec, dependsOn: checkPythonVersion) { inputs.file file('setup.py') outputs.dir("${venv_name}") - commandLine 'bash', '-c', "${python_executable} -m venv ${venv_name} && ${venv_name}/bin/python -m pip install --upgrade pip wheel 'setuptools>=63.0.0'" + commandLine 'bash', '-c', + "${python_executable} -m venv ${venv_name} && " + + "${venv_name}/bin/python -m pip install --upgrade pip wheel 'setuptools>=63.0.0'" } task runPreFlightScript(type: Exec, dependsOn: environmentSetup) { def sentinel_file = ".preflight_sentinel" outputs.file(sentinel_file) - commandLine "scripts/datahub_preflight.sh" - commandLine 'bash', '-c', "touch ${sentinel_file}" + commandLine 'bash', '-c', + "scripts/datahub_preflight.sh && " + + "touch ${sentinel_file}" } task installPackageOnly(type: Exec, dependsOn: runPreFlightScript) { @@ -38,8 +41,9 @@ task installPackageOnly(type: Exec, dependsOn: runPreFlightScript) { inputs.file file('setup.py') outputs.dir("${venv_name}") outputs.file(sentinel_file) - commandLine 'bash', '-x', '-c', "${venv_name}/bin/pip install -e ." - commandLine 'bash', '-c', "touch ${sentinel_file}" + commandLine 'bash', '-x', '-c', + "${venv_name}/bin/pip install -e . &&" + + "touch ${sentinel_file}" } task installPackage(type: Exec, dependsOn: installPackageOnly) {