espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 10:48:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/build_test_fix' into 'master'

Browse Source 
CI: Fixes build test issues

See merge request espressif/esp-mqtt!72
This commit is contained in:
David Čermák
2020-07-31 19:40:25 +08:00
parent d754293d25 0bafcc5188
commit 702da6d528
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -72,6 +72,11 @@ build_with_idf_v4:
- export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS} - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
# build other examples # build other examples
- $MQTT_PATH/ci/build_examples.sh - $MQTT_PATH/ci/build_examples.sh
# rebuild with IDFv4.2
- $MQTT_PATH/ci/set_idf.sh release/v4.2
- 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.1 # rebuild with IDFv4.1
- $MQTT_PATH/ci/set_idf.sh release/v4.1 - $MQTT_PATH/ci/set_idf.sh release/v4.1
- cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" - cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"

8
.travis.yml
View File

@ -17,7 +17,7 @@ before_install:
- git checkout -b temporary_ref_branch - git checkout -b temporary_ref_branch
- CI_COMMIT_SHA=$(git rev-parse HEAD) - CI_COMMIT_SHA=$(git rev-parse HEAD)
# Test building with latest (stable == v3.3 for now) IDF # Test building with latest (stable == v3.3 for now) IDF
- LATEST_IDF=release/v3.3 - LTS_IDF=release/v3.3
install: install:
# Install ESP32 toochain following steps as desribed # Install ESP32 toochain following steps as desribed
@ -44,13 +44,13 @@ script:
- cd $IDF_PATH - cd $IDF_PATH
- git checkout v3.1 && git submodule update --init --recursive - git checkout v3.1 && git submodule update --init --recursive
- cd $PROJECT_PATH - cd $PROJECT_PATH
- ./modify_for_legacy_idf.sh ${LATEST_IDF} || true - ./ci/modify_for_legacy_idf.sh ${LTS_IDF} || true
- cd $PROJECT_PATH/examples/tcp - cd $PROJECT_PATH/examples/tcp
- make defconfig - make defconfig
- make -j4 - make -j4
# Build with latest IDF # Build with v3.3 (LTS) IDF
- cd $IDF_PATH - cd $IDF_PATH
- git checkout ${LATEST_IDF} && git submodule update --init --recursive - git checkout ${LTS_IDF} && git submodule update --init --recursive
- cd $IDF_PATH/components/mqtt/esp-mqtt - cd $IDF_PATH/components/mqtt/esp-mqtt
- git remote add local $PROJECT_PATH/.git - git remote add local $PROJECT_PATH/.git
- git fetch local - git fetch local

2
ci/build_examples.sh
View File

@ -16,7 +16,7 @@ for i in $examples; do
make defconfig make defconfig
make -j 4 make -j 4
else else
rm -rf build rm -rf build sdkconfig
idf.py build idf.py build
fi; fi;
done done

4
ci/set_idf.sh
View File

@ -13,7 +13,7 @@ cd $IDF_PATH
# Cleans out the untracked files in the repo, so the next "git checkout" doesn't fail # Cleans out the untracked files in the repo, so the next "git checkout" doesn't fail
git clean -f git clean -f
git checkout $1 git checkout $1
# Removes the mqtt submodule, not the next submodule update doesn't fail # Removes the mqtt submodule, so the next submodule update doesn't fail
rm -rf $IDF_PATH/components/mqtt/esp-mqtt rm -rf $IDF_PATH/components/mqtt/esp-mqtt
./tools/ci/mirror-submodule-update.sh git submodule update --init --recursive