From 6ef98d6510dde806ccd1e10b8c656bcd380b8206 Mon Sep 17 00:00:00 2001
From: Darian Leung <darian@espressif.com>
Date: Thu, 13 Jan 2022 00:32:32 +0800
Subject: [PATCH 1/2] Client: Remove usage of legacy FreeRTOS types

---
 mqtt_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mqtt_client.c b/mqtt_client.c
index c8a4d55..3b41791 100644
--- a/mqtt_client.c
+++ b/mqtt_client.c
@@ -1526,7 +1526,7 @@ static void esp_mqtt_task(void *pv)
             }
             MQTT_API_UNLOCK(client);
             xEventGroupWaitBits(client->status_bits, RECONNECT_BIT, false, true,
-                                client->wait_timeout_ms / 2 / portTICK_RATE_MS);
+                                client->wait_timeout_ms / 2 / portTICK_PERIOD_MS);
             // continue the while loop instead of break, as the mutex is unlocked
             continue;
         default:

From c28a56ddb0685bfe349cb0091b1b6124cab3d434 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Mon, 17 Jan 2022 09:58:43 +0100
Subject: [PATCH 2/2] ci: Fix build issues with IDF-4.4 against master

IDF env docker image (v4.4-1) became incompatible with IDF master (v5.0)
---
 .gitlab-ci.yml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc5f6e3..215b848 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,28 +51,18 @@ build_with_idf_v4:
   tags:
     - build
   dependencies: []
-  artifacts:
-    when: always
-    paths:
-      - tidybuild/*
-    expire_in: 1 day
   variables:
     PYTHON_VER: 3.6.13
   script:
     - git clone "${IDF_REPO}"
     - source /opt/pyenv/activate && pyenv global $PYTHON_VER
-    - $MQTT_PATH/ci/set_idf.sh master
-    - cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
-    - $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
-    # capture compile commands/flags for static analysis
-    - cd $IDF_PATH/examples/protocols/mqtt/tcp
-    - mkdir -p tidybuild && cd tidybuild
-    - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
-    - mv $IDF_PATH/examples/protocols/mqtt/tcp/tidybuild $CI_PROJECT_DIR/tidybuild
     # enable pedantic flags for compilation
     - export PEDANTIC_CFLAGS="-Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
     - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
-    # build other examples
+    # rebuild with IDFv4.4
+    - $MQTT_PATH/ci/set_idf.sh release/v4.4
+    - cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
+    - $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
     - $MQTT_PATH/ci/build_examples.sh
     # rebuild with IDFv4.3
     - $MQTT_PATH/ci/set_idf.sh release/v4.3
@@ -113,7 +103,7 @@ build_and_test_qemu:
     - git clone "${IDF_REPO}"
     - source /opt/pyenv/activate && pyenv global $PYTHON_VER
     # switch to IDF and setup the tools
-    - $MQTT_PATH/ci/set_idf.sh master
+    - $MQTT_PATH/ci/set_idf.sh release/v4.4
     - cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
     - $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
     # build publish-connect stress test, setup test parameters