Skip to content

Commit 2ff2411

Browse files
committed
build(deps): update paho mqtt to v1.3.13
1 parent 84dc332 commit 2ff2411

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ci_build_features.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Install paho.mqtt.c
6161
if: ${{ matrix.config.short == 'mqtt'}}
62-
run: git clone --branch v1.3.12 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
62+
run: git clone --branch v1.3.13 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
6363

6464
- run: go run main.go install
6565
- name: generate ${{ matrix.config.short }} feature set
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Install paho.mqtt.c
121121
if: ${{ matrix.config.short == 'mqtt'}}
122-
run: git clone --branch v1.3.12 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
122+
run: git clone --branch v1.3.13 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
123123

124124
- run: go run main.go install
125125
- name: generate ${{ matrix.config.short }} feature set

.github/workflows/ci_build_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
- name: Install paho.mqtt.c using conan
119119
if: ${{ matrix.config.os != 'ubuntu-latest'}}
120120
run: |
121-
cd deps && conan install --requires=paho-mqtt-c/1.3.12@ --build missing -o paho-mqtt-c/*:shared=False --generator CMakeDeps --generator VirtualBuildEnv
121+
cd deps && conan install --requires=paho-mqtt-c/1.3.13@ --build missing -o paho-mqtt-c/*:shared=False --generator CMakeDeps --generator VirtualBuildEnv
122122
- name: Save cache conan on Windows
123123
uses: actions/cache/save@v3
124124
if: ${{ matrix.config.os == 'windows-latest'}}
@@ -139,7 +139,7 @@ jobs:
139139
run: sudo apt-get install -y cmake libpoco-dev nlohmann-json3-dev
140140
- name: Install paho.mqtt.c
141141
if: ${{ matrix.config.os == 'ubuntu-latest'}}
142-
run: git clone --branch v1.3.12 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
142+
run: git clone --branch v1.3.13 --depth 1 https://github.com/eclipse/paho.mqtt.c.git && cd paho.mqtt.c && cmake -Bbuild -H. -DPAHO_BUILD_SHARED=OFF -DPAHO_BUILD_STATIC=ON -DPAHO_WITH_SSL=ON -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
143143
- name: Install catch2
144144
if: ${{ matrix.config.os == 'ubuntu-latest'}}
145145
run: git clone --branch v2.13.8 --depth 1 https://github.com/catchorg/Catch2.git && cd Catch2 && cmake -Bbuild -H. -DBUILD_TESTING=OFF && sudo cmake --build build/ --target install
@@ -211,7 +211,7 @@ jobs:
211211
cd deps && conan install --profile=release --profile:build=release --requires=poco/1.12.4 --build missing -o poco/*:shared=False -o poco/*:enable_data_mysql=False -o poco/*:enable_activerecord=False -o poco/*:enable_apacheconnector=False -o poco/*:enable_cppparser=False -o poco/*:enable_crypto=True -o poco/*:enable_data=False -o poco/*:enable_data_odbc=False -o poco/*:enable_data_postgresql=False -o poco/*:enable_data_sqlite=False -o poco/*:enable_encodings=False -o poco/*:enable_json=False -o poco/*:enable_jwt=False -o poco/*:enable_mongodb=False -o poco/*:enable_net=True -o poco/*:enable_netssl=True -o poco/*:enable_pagecompiler=False -o poco/*:enable_pagecompiler_file2page=False -o poco/*:enable_pdf=False -o poco/*:enable_pocodoc=False -o poco/*:enable_redis=False -o poco/*:enable_sevenzip=False -o poco/*:enable_util=True -o poco/*:enable_xml=False -o poco/*:enable_zip=False --generator CMakeDeps --generator VirtualBuildEnv
212212
- name: Install paho.mqtt.c using conan
213213
run: |
214-
cd deps && conan install --profile=release --profile:build=release --requires=paho-mqtt-c/1.3.12 --build missing -o paho-mqtt-c/*:shared=False --generator CMakeDeps --generator VirtualBuildEnv
214+
cd deps && conan install --profile=release --profile:build=release --requires=paho-mqtt-c/1.3.13 --build missing -o paho-mqtt-c/*:shared=False --generator CMakeDeps --generator VirtualBuildEnv
215215
- name: Save cache conan on Windows
216216
uses: actions/cache/save@v3
217217
if: ${{ matrix.config.os == 'windows-latest'}}

goldenmaster/apigear/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def requirements(self):
7373
if self.options.enable_monitor or self.options.enable_olink:
7474
self.requires("poco/1.12.4", transitive_headers=True, transitive_libs=True)
7575
if self.options.enable_mqtt:
76-
self.requires("paho-mqtt-c/1.3.12", transitive_headers=True)
76+
self.requires("paho-mqtt-c/1.3.13", transitive_headers=True, transitive_libs=True)
7777

7878
def build_requirements(self):
7979
self.test_requires("catch2/2.13.7")

templates/apigear/conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def requirements(self):
7373
if self.options.enable_monitor or self.options.enable_olink:
7474
self.requires("poco/1.12.4", transitive_headers=True, transitive_libs=True)
7575
if self.options.enable_mqtt:
76-
self.requires("paho-mqtt-c/1.3.12", transitive_headers=True)
76+
self.requires("paho-mqtt-c/1.3.13", transitive_headers=True, transitive_libs=True)
7777

7878
def build_requirements(self):
7979
self.test_requires("catch2/2.13.7")

0 commit comments

Comments
 (0)