From 341cc8221cd12edd254a451189d589d59f67a1fe Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Thu, 20 Jul 2017 16:46:30 +0800 Subject: [PATCH 1/2] CI: Make the list of examples permanent between jobs Because the results of the 'find' command are not sorted by name. --- tools/ci/build_examples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/build_examples.sh b/tools/ci/build_examples.sh index 14a8e9b425..65b82160fe 100755 --- a/tools/ci/build_examples.sh +++ b/tools/ci/build_examples.sh @@ -134,7 +134,7 @@ build_example () { EXAMPLE_NUM=0 -find ${IDF_PATH}/examples/ -type f -name Makefile | \ +find ${IDF_PATH}/examples/ -type f -name Makefile | sort | \ while read FN do if [[ $EXAMPLE_NUM -lt $START_NUM || $EXAMPLE_NUM -ge $END_NUM ]] From 0e54caabe3defa51e81710ceae67c41d8ba00e93 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 20 Jul 2017 16:40:03 +0800 Subject: [PATCH 2/2] examples: add missing nvs_flash.h include --- .../controller_hci_uart/main/controller_hci_uart_demo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c b/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c index 0aa130de8f..0cce686de2 100644 --- a/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c +++ b/examples/bluetooth/controller_hci_uart/main/controller_hci_uart_demo.c @@ -14,7 +14,7 @@ #include #include -#include "nvs.h" +#include "nvs_flash.h" #include "bt.h" #include "driver/uart.h" #include "esp_log.h"