Merge pull request #881 from david-cermak/fix/minor_ci_fixes

Fixup common CI issues with v6.0 idf-tools
This commit is contained in:
david-cermak
2025-09-03 13:16:49 +02:00
committed by GitHub
6 changed files with 5 additions and 6 deletions

View File

@@ -33,6 +33,9 @@ jobs:
shell: bash shell: bash
working-directory: ${{matrix.test.path}} working-directory: ${{matrix.test.path}}
run: | run: |
if [[ "${{ matrix.idf_ver }}" == "release-v5.3" || "${{ matrix.idf_ver }}" == "release-v5.4" ]]; then
export EXPECTED_WARNING="unknown kconfig symbol 'LWIP_USE_ESP_GETADDRINFO'"
fi
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
pip install idf-component-manager idf-build-apps --upgrade pip install idf-component-manager idf-build-apps --upgrade
python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app python ../../../ci/build_apps.py ./${{ matrix.test.app }} --target ${{ matrix.idf_target }} -vv --preserve-all --pytest-app

View File

@@ -25,9 +25,6 @@ jobs:
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }} - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
shell: bash shell: bash
run: | run: |
if [[ "${{ matrix.idf_ver }}" != "latest" ]]; then
export EXPECTED_WARNING="unknown kconfig symbol 'MBEDTLS_SSL_COOKIE_C'"
fi
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh
pip install idf-component-manager idf-build-apps --upgrade pip install idf-component-manager idf-build-apps --upgrade
python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.path }} -vv --preserve-all python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.path }} -vv --preserve-all

View File

@@ -1,3 +1,2 @@
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
CONFIG_MBEDTLS_SSL_COOKIE_C=y
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192

View File

@@ -1,4 +1,3 @@
CONFIG_IDF_TARGET="esp32" CONFIG_IDF_TARGET="esp32"
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
CONFIG_MBEDTLS_SSL_COOKIE_C=y
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=8192

View File

@@ -34,6 +34,7 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi
-I$(COMPONENTS_DIR)/soc/src/esp32/include \ -I$(COMPONENTS_DIR)/soc/src/esp32/include \
-I$(COMPONENTS_DIR)/xtensa/include \ -I$(COMPONENTS_DIR)/xtensa/include \
-I$(COMPONENTS_DIR)/xtensa/esp32/include \ -I$(COMPONENTS_DIR)/xtensa/esp32/include \
-I$(COMPONENTS_DIR)/esp_hw_support/etm/include \
-I$(COMPILER_ICLUDE_DIR)/include -I$(COMPILER_ICLUDE_DIR)/include

View File

@@ -16,7 +16,7 @@ index d248d59..1117926 100644
TaskHandle_t cur_task = xTaskGetCurrentTaskHandle(); TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
vTaskGetSnapshot(cur_task, &snap_shot); vTaskGetSnapshot(cur_task, &snap_shot);
- snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);; - snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);;
+#if (ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 5, 0)) +#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0))
+ snap_shot.pxTopOfStack = xTaskGetStackStart(cur_task); + snap_shot.pxTopOfStack = xTaskGetStackStart(cur_task);
+#else +#else
+ snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task); + snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);