From 2a74f8a687ae44ba03eeed844f3a6f9b97a346bc Mon Sep 17 00:00:00 2001 From: bugobliterator Date: Fri, 13 Mar 2020 17:01:59 +1100 Subject: [PATCH] Azure: fix build with uavcan support --- .azure/autotest_template.yml | 2 ++ .azure/azure-pipelines.yml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.azure/autotest_template.yml b/.azure/autotest_template.yml index f185c14270..7919f7384c 100644 --- a/.azure/autotest_template.yml +++ b/.azure/autotest_template.yml @@ -14,6 +14,8 @@ jobs: displayName: 'Install Cygwin packages' - script: git submodule update --recursive --init modules/mavlink 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" displayName: 'Install pymavlink from submodule' - script: C:\Cygwin\bin\bash --login -c "pip install MAVProxy" diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index af0de89934..ae68d010fc 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -8,8 +8,10 @@ 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 git gettext --source cygwin + - script: choco install cygwin32-gcc-g++ python36 python36-future python36-lxml python36-pip python-setuptools 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 - script: C:\Cygwin\bin\bash --login -c "ln -s /usr/bin/python3.6 /usr/bin/python && ln -s /usr/bin/pip3.6 /usr/bin/pip" displayName: 'Make Python 3.6 the default Python'