aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2020-10-06 18:14:07 +1100
committerDamien George <damien@micropython.org>2020-10-30 00:38:44 +1100
commitb488742e2633cc002fea64e5230d3f142620cd7f (patch)
tree5990bfa24b68be0406e11d5547495ba84bb70414
parent88d8639d88203ad660d6fd8900fdbc4c60f196bd (diff)
travis: Update esp32 CI to build with cmake.esp32-idf41-cmake
Signed-off-by: Damien George <damien@micropython.org>
-rw-r--r--.travis.yml34
1 files changed, 10 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index 14595ddeb..0bd8d4cec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -268,39 +268,25 @@ jobs:
- make ${MAKEOPTS} -C mpy-cross
- make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
- # esp32 w/ESP-IDFv3 port
+ # esp32 port
- stage: test
- name: "esp32 ESP-IDFv3 port build"
+ name: "esp32 port build"
install:
- - sudo apt-get install python3-pip
- - sudo pip3 install 'pyparsing<2.4'
- - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
+ - cmake --version
+ - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2020r2-linux-amd64.tar.gz | tar zxf -
- export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
- git clone https://github.com/espressif/esp-idf.git
+ - git -C esp-idf checkout v4.1
+ - git -C esp-idf submodule update --init
- export IDF_PATH=$(pwd)/esp-idf
- script:
- - make ${MAKEOPTS} -C mpy-cross
- - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
- - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
- - make ${MAKEOPTS} -C ports/esp32 submodules
- - make ${MAKEOPTS} -C ports/esp32
-
- # esp32 w/ESP-IDFv4 port
- - stage: test
- name: "esp32 ESP-IDFv4 port build"
- install:
- sudo apt-get install python3-pip
- - sudo pip3 install 'pyparsing<2.4'
- - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
- - export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
- - git clone https://github.com/espressif/esp-idf.git
- - export IDF_PATH=$(pwd)/esp-idf
+ - sudo pip3 install setuptools
+ - sudo pip3 install -r $IDF_PATH/requirements.txt
script:
- make ${MAKEOPTS} -C mpy-cross
- - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
- - git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
- make ${MAKEOPTS} -C ports/esp32 submodules
- - make ${MAKEOPTS} -C ports/esp32
+ - (mkdir build && cd build && cmake -D PYTHON=python3 ../ports/esp32)
+ - make ${MAKEOPTS} -C build
# esp8266 port
- stage: test