From 60e1d226bb29b3d2df7b560814b5b920f936f447 Mon Sep 17 00:00:00 2001 From: zhangjunhao Date: Thu, 19 Apr 2018 18:22:25 +0800 Subject: [PATCH 1/2] fix(websocket_demo): Fix websocket demo compile error --- examples/websocket_demo/Makefile | 3 ++- examples/websocket_demo/websocket/websocket.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/websocket_demo/Makefile b/examples/websocket_demo/Makefile index 5ba30ad2..a1d8d8c4 100644 --- a/examples/websocket_demo/Makefile +++ b/examples/websocket_demo/Makefile @@ -70,7 +70,8 @@ LINKFLAGS_eagle.app.v6 = \ -lphy \ -lpp \ -lsmartconfig \ - -lssl \ + -lopenssl \ + -lmbedtls \ -lwpa \ $(DEP_LIBS_eagle.app.v6)\ -Wl,--end-group diff --git a/examples/websocket_demo/websocket/websocket.c b/examples/websocket_demo/websocket/websocket.c index 69f6197e..cc37acee 100644 --- a/examples/websocket_demo/websocket/websocket.c +++ b/examples/websocket_demo/websocket/websocket.c @@ -37,7 +37,6 @@ * info@aspl.es - http://www.aspl.es/nopoll */ #include -#include "ssl_compat-1.0.h" #include "esp_common.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" From 397a0999a57bdd05e817808361407c1a927c856e Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 20 Apr 2018 14:20:56 +0800 Subject: [PATCH 2/2] fix(ci): Fix internal ci --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d542c35..1ba1cfb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,8 @@ stages: variables: GIT_STRATEGY: clone + IDF_PATH: "$CI_PROJECT_DIR" + # before each job, we need to check if this job is filtered by bot stage/job filter .apply_bot_filter: &apply_bot_filter python $APPLY_BOT_FILTER_SCRIPT || exit 0