Skip to content

Fix standalone component build and enable CI check for it #8743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,30 +82,30 @@ jobs:
- name: Build Sketches
run: bash ./.github/scripts/on-push.sh 1 1 #equal and non-zero to trigger PIO

# build-esp-idf-component:
# name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
# runs-on: ubuntu-20.04
# strategy:
# matrix:
# # The version names here correspond to the versions of espressif/idf Docker image.
# # See https://hub.docker.com/r/espressif/idf/tags and
# # https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
# # for details.
# idf_ver: ["release-v4.4"]
# idf_target: ["esp32", "esp32s2", "esp32s3", "esp32c3"]
# container: espressif/idf:${{ matrix.idf_ver }}
# steps:
# - name: Check out arduino-esp32 as a component
# uses: actions/checkout@v3
# with:
# submodules: recursive
# path: components/arduino-esp32
# - name: Build
# env:
# IDF_TARGET: ${{ matrix.idf_target }}
# shell: bash
# run: |
# . ${IDF_PATH}/export.sh
# idf.py create-project test
# echo CONFIG_FREERTOS_HZ=1000 > test/sdkconfig.defaults
# idf.py -C test -DEXTRA_COMPONENT_DIRS=$PWD/components build
build-esp-idf-component:
name: Build with ESP-IDF ${{ matrix.idf_ver }} for ${{ matrix.idf_target }}
runs-on: ubuntu-20.04
strategy:
matrix:
# The version names here correspond to the versions of espressif/idf Docker image.
# See https://hub.docker.com/r/espressif/idf/tags and
# https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
# for details.
idf_ver: ["release-v5.1"]
idf_target: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c6", "esp32h2"]
container: espressif/idf:${{ matrix.idf_ver }}
steps:
- name: Check out arduino-esp32 as a component
uses: actions/checkout@v3
with:
submodules: recursive
path: components/arduino-esp32
- name: Build
env:
IDF_TARGET: ${{ matrix.idf_target }}
shell: bash
run: |
. ${IDF_PATH}/export.sh
idf.py create-project test
echo CONFIG_FREERTOS_HZ=1000 > test/sdkconfig.defaults
idf.py -C test -DEXTRA_COMPONENT_DIRS=$PWD/components build
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ set(includedirs

set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
set(priv_includes cores/esp32/libb64)
set(requires spi_flash mbedtls mdns wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
set(requires spi_flash mbedtls wifi_provisioning wpa_supplicant esp_adc esp_eth http_parser)
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support bt esp_hid)

idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
Expand Down
4 changes: 4 additions & 0 deletions idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ files:
- "Kconfig.projbuild"
exclude:
- "**/*"
dependencies:
idf: ">=5.1"
mdns: "^1.1.0"
chmorgan/esp-libhelix-mp3: "1.0.3"