Skip to content

Commit 1689c2e

Browse files
jcfrthewtex
authored andcommitted
macpython/manylinux: Exit scripts if one of the build steps fail
1 parent 45ebb23 commit 1689c2e

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

scripts/internal/manylinux-build-module-wheels.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
4646
-DBUILD_TESTING:BOOL=OFF \
4747
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
4848
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
49-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
49+
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
50+
|| exit 1
5051
${PYBIN}/python setup.py clean
5152
done
5253

scripts/internal/manylinux-build-wheels.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
9090
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \
9191
-G Ninja \
9292
${source_path} \
93-
&& ninja
93+
&& ninja \
94+
|| exit 1
9495
)
9596

9697
wheel_names=$(cat ${script_dir}/../WHEEL_NAMES.txt)
@@ -105,7 +106,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
105106
-DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
106107
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
107108
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
108-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
109+
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
110+
|| exit 1
109111
# Cleanup
110112
${PYBIN}/python setup.py clean
111113
done

scripts/macpython-build-module-wheels.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ for VENV in "${VENVS[@]}"; do
5353
-DBUILD_TESTING:BOOL=OFF \
5454
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
5555
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
56-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
56+
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
57+
|| exit 1
5758
$PYTHON_EXECUTABLE setup.py clean
5859
done
5960

scripts/macpython-build-wheels.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ for VENV in "${VENVS[@]}"; do
125125
-DITK_WRAP_PYTHON_LEGACY:BOOL=OFF \
126126
-G Ninja \
127127
${source_path} \
128-
&& ninja
128+
&& ninja\
129+
|| exit 1
129130
)
130131

131132
wheel_names=$(cat ${SCRIPT_DIR}/WHEEL_NAMES.txt)
@@ -142,7 +143,8 @@ for VENV in "${VENVS[@]}"; do
142143
-DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
143144
-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} \
144145
-DPYTHON_INCLUDE_DIR:PATH=${PYTHON_INCLUDE_DIR} \
145-
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}
146+
-DPYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY} \
147+
|| exit 1
146148
# Cleanup
147149
$PYTHON_EXECUTABLE setup.py clean
148150
done

0 commit comments

Comments
 (0)