Merge pull request #852 from david-cermak/fix/mqtt_endpoints

fix(examples): Address MQTT public endpoint availability

.github/workflows/examples_build-host-test.yml

@@ -59,10 +59,11 @@ jobs:
       - name: Build with IDF-${{ matrix.idf_ver }}
         shell: bash
         run: |
+          . ${GITHUB_WORKSPACE}/ci/config_env.sh
           . ${IDF_PATH}/export.sh
           python -m pip install idf-build-apps
-          python ./ci/build_apps.py examples/mqtt -l -t linux
-          timeout 5 ./examples/mqtt/build_linux_default/esp_mqtt_demo.elf | tee test.log  || true
+          python ./ci/build_apps.py examples/mqtt -l -t linux -r 'sdkconfig.ci'
+          timeout 5 ./examples/mqtt/build_linux/esp_mqtt_demo.elf | tee test.log  || true
           grep 'MQTT_EVENT_DATA' test.log
 
   run_on_target:

.github/workflows/modem__target-test.yml

@@ -36,6 +36,7 @@ jobs:
         shell: bash
         working-directory: ${{ env.TEST_DIR }}
         run: |
+          . ${GITHUB_WORKSPACE}/ci/config_env.sh
           . ${IDF_PATH}/export.sh
           rm -rf sdkconfig build
           [ -f ${SDKCONFIG} ] && cp ${SDKCONFIG} sdkconfig.defaults

.pre-commit-config.yaml

@@ -25,12 +25,8 @@ repos:
            (?x)^(
                .*.py
            )$
-  - repo: https://github.com/myint/unify
-    rev: v0.5
-    hooks:
-      - id: unify
-  - repo: https://github.com/pre-commit/mirrors-yapf
-    rev: "v0.32.0"
+  - repo: https://github.com/google/yapf
+    rev: "v0.43.0"
     hooks:
       - id: yapf
         args: ['style={based_on_style: google, column_limit: 160, indent_width: 4}']
@@ -39,7 +35,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/myint/eradicate/
-    rev: v2.1.0
+    rev: 3.0.0
     hooks:
       - id: eradicate
   - repo: https://github.com/espressif/check-copyright/

ci/build_apps.py

@@ -65,6 +65,7 @@ if __name__ == '__main__':
 
     sys.exit(
         build_apps(apps,
+                   verbose=2,
                    dry_run=False,
                    keep_going=False,
                    no_preserve=args.delete,

ci/config_env.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# This script is used to set some common variables for the CI pipeline.
+
+set -e
+
+# MQTT public broker URI
+export CI_MQTT_BROKER_URI="broker.emqx.io"

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

@@ -15,3 +15,4 @@ CONFIG_EXAMPLE_PAUSE_NETIF_TO_CHECK_SIGNAL=y
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 CONFIG_ESP32_PANIC_PRINT_HALT=y
 CONFIG_EXAMPLE_DETECT_MODE_BEFORE_CONNECT=y
+CONFIG_EXAMPLE_MQTT_BROKER_URI="mqtt://${CI_MQTT_BROKER_URI}"

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

@@ -12,3 +12,4 @@ CONFIG_EXAMPLE_MODEM_PPP_AUTH_NONE=y
 CONFIG_EXAMPLE_MQTT_TEST_TOPIC="/ci/esp-modem/pppos-client"
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
 CONFIG_ESP32_PANIC_PRINT_HALT=y
+CONFIG_EXAMPLE_MQTT_BROKER_URI="mqtt://${CI_MQTT_BROKER_URI}"

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

@@ -16,4 +16,4 @@ CONFIG_COMPILER_CXX_EXCEPTIONS=y
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_EXAMPLE_CLOSE_CMUX_AT_END=y
 CONFIG_EXAMPLE_MQTT_TEST_TOPIC="/ci/esp-modem/pppos-client"
-CONFIG_BROKER_URI="mqtt://test.mosquitto.org"
+CONFIG_BROKER_URI="mqtt://${CI_MQTT_BROKER_URI}"

components/mdns/private_include/mdns_private.h

@@ -154,7 +154,7 @@
         }                                           \
     }
 
-#define queueFree(type, queue)  while (queue) { type * _q = queue; queue = queue->next; free(_q); }
+#define queueFree(type, queue)  while (queue) { type * _q = queue; queue = queue->next; mdns_mem_free(_q); }
 
 #define PCB_STATE_IS_PROBING(s) (s->state > PCB_OFF && s->state < PCB_ANNOUNCE_1)
 #define PCB_STATE_IS_ANNOUNCING(s) (s->state > PCB_PROBE_3 && s->state < PCB_RUNNING)

examples/mqtt/sdkconfig.ci

@@ -0,0 +1,2 @@
+# CONFIG_ESP_EVENT_POST_FROM_ISR is not set
+CONFIG_BROKER_URL="mqtt://${CI_MQTT_BROKER_URI}"