Skip to content

Commit e9d9b3a

Browse files
committed
fix(modem): Use idf-build-apps for building target tests
Also updates default mqtt broker public endpoint
1 parent 07e8edd commit e9d9b3a

File tree

5 files changed

+5
-12
lines changed

5 files changed

+5
-12
lines changed

.github/workflows/modem__target-test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,16 @@ jobs:
3434
IDF_TARGET: ${{ matrix.idf_target }}
3535
SDKCONFIG: sdkconfig.ci.${{ matrix.test.app }}
3636
shell: bash
37-
working-directory: ${{ env.TEST_DIR }}
3837
run: |
3938
. ${GITHUB_WORKSPACE}/ci/config_env.sh
4039
. ${IDF_PATH}/export.sh
41-
rm -rf sdkconfig build
42-
[ -f ${SDKCONFIG} ] && cp ${SDKCONFIG} sdkconfig.defaults
43-
idf.py set-target ${{ matrix.idf_target }}
44-
idf.py build
45-
$GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build
40+
python -m pip install idf-build-apps
41+
python ./ci/build_apps.py ${{ env.TEST_DIR }} -t ${{ matrix.idf_target }} -r 'sdkconfig.ci.${{ matrix.test.app }}'
42+
$GITHUB_WORKSPACE/ci/clean_build_artifacts.sh ${GITHUB_WORKSPACE}/${TEST_DIR}/build_${{ matrix.idf_target }}
4643
- uses: actions/upload-artifact@v4
4744
with:
4845
name: modem_target_bin_${{ matrix.idf_target }}_${{ matrix.idf_ver }}_${{ matrix.test.app }}
49-
path: ${{ env.TEST_DIR }}/build
46+
path: ${{ env.TEST_DIR }}/build_${{ matrix.idf_target }}
5047
if-no-files-found: error
5148

5249
target_tests_esp_modem:

ci/config_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
set -e
55

66
# MQTT public broker URI
7-
export CI_MQTT_BROKER_URI="broker.emqx.io"
7+
export CI_MQTT_BROKER_URI="test.mosquitto.org"

components/esp_modem/examples/pppos_client/sdkconfig.ci.sim800_c3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ CONFIG_EXAMPLE_MODEM_PPP_APN="lpwa.vodafone.com"
1313
CONFIG_EXAMPLE_MQTT_TEST_TOPIC="/ci/esp-modem/pppos-client"
1414
CONFIG_EXAMPLE_PAUSE_NETIF_TO_CHECK_SIGNAL=y
1515
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
16-
CONFIG_ESP32_PANIC_PRINT_HALT=y
1716
CONFIG_EXAMPLE_DETECT_MODE_BEFORE_CONNECT=y
1817
CONFIG_EXAMPLE_MQTT_BROKER_URI="mqtt://${CI_MQTT_BROKER_URI}"

components/esp_modem/examples/pppos_client/sdkconfig.ci.usb_a7670_s2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ CONFIG_LWIP_PPP_ENABLE_IPV6=n
88
CONFIG_EXAMPLE_SERIAL_CONFIG_USB=y
99
CONFIG_EXAMPLE_MODEM_DEVICE_A7670=y
1010
CONFIG_EXAMPLE_MODEM_PPP_APN="lpwa.vodafone.com"
11-
CONFIG_EXAMPLE_MODEM_PPP_AUTH_NONE=y
1211
CONFIG_EXAMPLE_MQTT_TEST_TOPIC="/ci/esp-modem/pppos-client"
1312
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
14-
CONFIG_ESP32_PANIC_PRINT_HALT=y
1513
CONFIG_EXAMPLE_MQTT_BROKER_URI="mqtt://${CI_MQTT_BROKER_URI}"

components/esp_modem/examples/simple_cmux_client/sdkconfig.ci.sim800_cmux

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CONFIG_EXAMPLE_MODEM_DEVICE_SIM800=y
1111
CONFIG_EXAMPLE_MODEM_DEVICE_BG96=n
1212
CONFIG_EXAMPLE_MODEM_PPP_APN="lpwa.vodafone.com"
1313
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
14-
CONFIG_ESP32_PANIC_PRINT_HALT=y
1514
CONFIG_COMPILER_CXX_EXCEPTIONS=y
1615
CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
1716
CONFIG_EXAMPLE_CLOSE_CMUX_AT_END=y

0 commit comments

Comments
 (0)