Skip to content

Commit 18df990

Browse files
bia1708cristina-suteu
authored andcommitted
azure_pipelines.yml: Fix macos CIs
There are two different python versions installed inside the Microsoft Azure macos containers. Install setuptools for the default python. Specify which python cmake should use (the one for which the setuptools package was installed). This change is also introduced in e3d4c9f. Signed-off-by: bia1708 <[email protected]>
1 parent a436ad6 commit 18df990

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,21 +328,21 @@ stages:
328328
- script: |
329329
set -e
330330
brew install doxygen libusb libxml2 ncurses cdk libserialport sphinx-doc pkg-config
331-
pip3 install sphinx
331+
pip3 install sphinx setuptools
332332
displayName: 'Dependencies'
333333
condition: ne(variables['agentName'],'miniMAC_arm64')
334334
- script: |
335335
set -e
336336
mkdir build && cd build
337-
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=ON -DCPP_BINDINGS=ON -DPYTHON_BINDINGS=ON -DWITH_EXAMPLES=ON -DWITH_SERIAL_BACKEND=ON -DWITH_ZSTD=OFF
337+
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=ON -DCPP_BINDINGS=ON -DPYTHON_EXECUTABLE:FILEPATH=$(python -c "import os, sys; print(os.path.dirname(sys.executable) + '/python')") -DPYTHON_BINDINGS=ON -DWITH_EXAMPLES=ON -DWITH_SERIAL_BACKEND=ON -DWITH_ZSTD=OFF
338338
make
339339
sudo make install
340340
cd ..
341341
displayName: 'Build'
342342
- script: |
343343
set -e
344344
mkdir build_tar && cd build_tar
345-
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DCPP_BINDINGS=ON -DPYTHON_BINDINGS=ON -DWITH_SERIAL_BACKEND=ON -DWITH_ZSTD=OFF -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
345+
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DCPP_BINDINGS=ON -DPYTHON_EXECUTABLE:FILEPATH=$(python -c "import os, sys; print(os.path.dirname(sys.executable) + '/python')") -DPYTHON_BINDINGS=ON -DWITH_SERIAL_BACKEND=ON -DWITH_ZSTD=OFF -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
346346
make
347347
make package
348348
mv ../CI/azure/macos_tar_fixup.sh .

0 commit comments

Comments
 (0)