Skip to content

Commit 1210b4e

Browse files
committed
fix(mosq): Reverts relax CI criteria to build on v5.2+
This reverts commit 25671a6.
1 parent 2b9345e commit 1210b4e

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/mosq__build.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ jobs:
1313
name: Mosquitto build
1414
strategy:
1515
matrix:
16-
idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3", "release-v5.2"]
16+
idf_ver: ["latest", "release-v5.5", "release-v5.4", "release-v5.3", "release-v5.2", "release-v5.1"]
17+
example: ["broker", "serverless_mqtt"]
18+
exclude:
19+
- idf_ver: "release-v5.1"
20+
example: "serverless_mqtt" # serverless_mqtt is not supported due to esp-peer
21+
1722
runs-on: ubuntu-22.04
1823
container: espressif/idf:${{ matrix.idf_ver }}
1924
env:
20-
TEST_DIR: components/mosquitto/examples
25+
TEST_DIR: components/mosquitto/examples/${{ matrix.example }}
2126
TARGET_TEST: broker
2227
TARGET_TEST_DIR: build_esp32_default
2328
steps:
@@ -31,14 +36,16 @@ jobs:
3136
. ${IDF_PATH}/export.sh
3237
pip install idf-component-manager idf-build-apps --upgrade
3338
python ci/build_apps.py -c ${TEST_DIR} -m components/mosquitto/.build-test-rules.yml
34-
# upload only the target test artifacts
35-
cd ${TEST_DIR}/${TARGET_TEST}
36-
${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
37-
zip -qur artifacts.zip ${TARGET_TEST_DIR}
39+
if [ "${{ matrix.example }}" == "${TARGET_TEST}" ]; then
40+
# upload only the target test artifacts
41+
cd ${TEST_DIR}
42+
${GITHUB_WORKSPACE}/ci/clean_build_artifacts.sh `pwd`/${TARGET_TEST_DIR}
43+
zip -qur artifacts.zip ${TARGET_TEST_DIR}
44+
fi
3845
- uses: actions/upload-artifact@v4
3946
with:
4047
name: mosq_target_esp32_${{ matrix.idf_ver }}
41-
path: ${{ env.TEST_DIR }}/${{ env.TARGET_TEST }}/artifacts.zip
48+
path: ${{ env.TEST_DIR }}/artifacts.zip
4249
if-no-files-found: error
4350

4451
test_mosq:

components/mosquitto/examples/serverless_mqtt/main/idf_component.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ dependencies:
33
espressif/mosquitto:
44
override_path: ../../..
55
espressif/sock_utils: "*"
6-
espressif/esp_libsrtp: "~1.0.0"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
CONFIG_IDF_TARGET="esp32s3"
1+
CONFIG_IDF_TARGET="esp32"
22
CONFIG_EXAMPLE_PEER_LIB_ESP_PEER=y
33
CONFIG_EXAMPLE_PEER_LIB_LIBJUICE=n

0 commit comments

Comments
 (0)