From e0725f582df88f7e9cc0441c67889f45ad855826 Mon Sep 17 00:00:00 2001 From: Jade Mattsson Date: Tue, 10 Dec 2024 12:38:08 +1100 Subject: [PATCH] Add chip-specific build defaults to CI To help compile-test the different console options, for starters. --- .github/workflows/build.yml | 2 +- sdkconfig.ci.esp32c3 | 7 +++++++ sdkconfig.ci.esp32s2 | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 sdkconfig.ci.esp32c3 create mode 100644 sdkconfig.ci.esp32s2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fbd524ce..d51ff0860 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: shell: bash - name: Prepare default sdkconfig run: | - cp sdkconfig.defaults sdkconfig + cidef="sdkconfig.ci.${{ matrix.target }}"; [ -e "$cidef" ] && cat "$cidef" >> "sdkconfig.defaults.${{ matrix.target }}" || true shell: bash - name: Update config for Lua 5.1 if: ${{ matrix.lua_ver == '5.1' }} diff --git a/sdkconfig.ci.esp32c3 b/sdkconfig.ci.esp32c3 new file mode 100644 index 000000000..61f1cf165 --- /dev/null +++ b/sdkconfig.ci.esp32c3 @@ -0,0 +1,7 @@ +CONFIG_USJ_ENABLE_USB_SERIAL_JTAG=y +# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set +CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y +# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set +# CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_SECONDARY_NONE=y +CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=y diff --git a/sdkconfig.ci.esp32s2 b/sdkconfig.ci.esp32s2 new file mode 100644 index 000000000..9d21ad104 --- /dev/null +++ b/sdkconfig.ci.esp32s2 @@ -0,0 +1,6 @@ +# CONFIG_ESP_CONSOLE_UART_DEFAULT is not set +CONFIG_ESP_CONSOLE_USB_CDC=y +# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set +# CONFIG_ESP_CONSOLE_NONE is not set +CONFIG_ESP_CONSOLE_USB_CDC_RX_BUF_SIZE=512 +