djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/ci.sh: Change esp32 CI to work with idf.py and IDF v4.0.2.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-02-14 10:28:05 +11:00
parent da2b5fa1c1
commit aa3d6b6aa5
2 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/ports_esp32.yml vendored
View File

@ -13,24 +13,11 @@ on:
- 'ports/esp32/**' - 'ports/esp32/**'
jobs: jobs:
idf3_build: build:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install packages - name: Install packages
run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH run: source tools/ci.sh && ci_esp32_setup
- name: Build - name: Build
env: run: source tools/ci.sh && ci_esp32_build
IDF_PATH: ${{ github.workspace }}/esp-idf
run: source tools/ci.sh && ci_esp32_idf3_build
idf4_build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install packages
run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
- name: Build
env:
IDF_PATH: ${{ github.workspace }}/esp-idf
run: source tools/ci.sh && ci_esp32_idf4_build

40
tools/ci.sh
View File

@ -82,38 +82,22 @@ function ci_cc3200_build {
######################################################################################## ########################################################################################
# ports/esp32 # ports/esp32
function ci_esp32_idf3_setup { function ci_esp32_setup {
sudo pip3 install pyserial '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 -
git clone https://github.com/espressif/esp-idf.git git clone https://github.com/espressif/esp-idf.git
git -C esp-idf checkout v4.0.2
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
./esp-idf/install.sh
} }
function ci_esp32_idf3_path { function ci_esp32_build {
echo $(pwd)/xtensa-esp32-elf/bin source esp-idf/export.sh
}
function ci_esp32_idf3_build {
make ${MAKEOPTS} -C mpy-cross 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
}
function ci_esp32_idf4_setup {
sudo pip3 install pyserial 'pyparsing<2.4'
curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
git clone https://github.com/espressif/esp-idf.git
}
function ci_esp32_idf4_path {
echo $(pwd)/xtensa-esp32-elf/bin
}
function ci_esp32_idf4_build {
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 submodules
make ${MAKEOPTS} -C ports/esp32 make ${MAKEOPTS} -C ports/esp32
} }