diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f6602d..2b427cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,6 +72,11 @@ build_with_idf_v4: - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS} # build other examples - $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 - $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)" diff --git a/.travis.yml b/.travis.yml index b900e93..4affec1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - git checkout -b temporary_ref_branch - CI_COMMIT_SHA=$(git rev-parse HEAD) # Test building with latest (stable == v3.3 for now) IDF - - LATEST_IDF=release/v3.3 + - LTS_IDF=release/v3.3 install: # Install ESP32 toochain following steps as desribed @@ -44,13 +44,13 @@ script: - cd $IDF_PATH - git checkout v3.1 && git submodule update --init --recursive - 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 - make defconfig - make -j4 - # Build with latest IDF + # Build with v3.3 (LTS) IDF - 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 - git remote add local $PROJECT_PATH/.git - git fetch local diff --git a/ci/build_examples.sh b/ci/build_examples.sh index 424b153..9643ea2 100755 --- a/ci/build_examples.sh +++ b/ci/build_examples.sh @@ -16,7 +16,7 @@ for i in $examples; do make defconfig make -j 4 else - rm -rf build + rm -rf build sdkconfig idf.py build fi; done diff --git a/ci/set_idf.sh b/ci/set_idf.sh index 4de46d7..1bd7ab8 100755 --- a/ci/set_idf.sh +++ b/ci/set_idf.sh @@ -13,7 +13,7 @@ cd $IDF_PATH # Cleans out the untracked files in the repo, so the next "git checkout" doesn't fail git clean -f 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 -./tools/ci/mirror-submodule-update.sh +git submodule update --init --recursive