Skip to content

Commit e3d4c9f

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). Signed-off-by: Bianca Popu <[email protected]>
1 parent b33304f commit e3d4c9f

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
@@ -331,21 +331,21 @@ stages:
331331
- script: |
332332
set -e
333333
brew install doxygen libusb libxml2 ncurses cdk libserialport sphinx-doc pkg-config zstd
334-
pip3 install sphinx
334+
pip3 install sphinx setuptools
335335
displayName: 'Dependencies'
336336
condition: ne(variables['agentName'],'miniMAC_arm64')
337337
- script: |
338338
set -e
339339
mkdir build && cd build
340-
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=ON -DPYTHON_BINDINGS=ON -DWITH_EXAMPLES=ON -DWITH_SERIAL_BACKEND=ON
340+
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=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
341341
make
342342
sudo make install
343343
cd ..
344344
displayName: 'Build'
345345
- script: |
346346
set -e
347347
mkdir build_tar && cd build_tar
348-
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_SERIAL_BACKEND=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
348+
cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_EXECUTABLE:FILEPATH=$(python -c "import os, sys; print(os.path.dirname(sys.executable) + '/python')") -DPYTHON_BINDINGS=ON -DWITH_SERIAL_BACKEND=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
349349
make
350350
make package
351351
mv ../CI/azure/macos_tar_fixup.sh .

0 commit comments

Comments
 (0)