Azure: fix python3 usage

This commit is contained in:
Pierre Kancir 2020-12-29 21:32:36 +01:00 committed by Peter Barker
parent 917230fe28
commit ebb0b4c265
2 changed files with 3 additions and 3 deletions

View File

@ -16,9 +16,9 @@ jobs:
displayName: Initialize MAVLink submodule
- script: git submodule update --recursive --init modules/uavcan
displayName: 'Initialize UAVCAN submodule'
- script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%')/modules/mavlink/pymavlink && python setup.py build install --user"
- script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%')/modules/mavlink/pymavlink && python3 setup.py build install --user"
displayName: 'Install pymavlink from submodule'
- script: C:\Cygwin\bin\bash --login -c "pip install MAVProxy"
- script: C:\Cygwin\bin\bash --login -c "pip3 install MAVProxy"
displayName: 'Install MAVProxy in Cygwin'
- script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%') && Tools/autotest/autotest.py ${{ format('build.{0} {1}.{2}', parameters.build_target, parameters.action, parameters.action_target) }}"
displayName: ${{ format('Run {0} autotest', parameters.name) }}

View File

@ -8,7 +8,7 @@ jobs:
- script: choco install cygwin --params "/InstallDir:C:\Cygwin /NoStartMenu /NoAdmin"
displayName: 'Install Cygwin'
- script: choco install cygwin32-gcc-g++ python36 python36-future python36-lxml python36-pip python-setuptools git libexpat procps gettext --source cygwin
- script: choco install cygwin32-gcc-g++ python36 python36-future python36-lxml python36-pip python36-setuptools python36-wheel git libexpat procps gettext --source cygwin
displayName: 'Install Cygwin packages'
- script: C:\Cygwin\bin\bash --login -c "cd $(cygpath '%BUILD_SOURCESDIRECTORY%') && git submodule update --recursive --init --depth 2"
displayName: Initialize submodules