From a6de0e88464ffe0279eed9cd212a7dbb82d52a5b Mon Sep 17 00:00:00 2001 From: chenyudong Date: Wed, 11 Dec 2019 11:40:20 +0800 Subject: [PATCH] ci: fix job "check_wifi_lib_md5" --- tools/ci/config/post_check.yml | 11 ----------- tools/ci/config/pre_check.yml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/ci/config/post_check.yml b/tools/ci/config/post_check.yml index d3d577892d..8d92bbefb9 100644 --- a/tools/ci/config/post_check.yml +++ b/tools/ci/config/post_check.yml @@ -24,17 +24,6 @@ check_submodule_sync: - git submodule update --recursive - echo "IDF was cloned from ${PUBLIC_IDF_URL} completely" -check_wifi_lib_md5: - extends: .check_job_template - tags: - - build - dependencies: [] - script: - - tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" - - git submodule update --init components/esp_wifi/lib - - IDF_TARGET=esp32 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh - - IDF_TARGET=esp32s2beta $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh - check_ut_cmake_make: extends: .check_job_template_with_filter stage: post_check diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml index 7b67e917e1..539467ed5a 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -76,6 +76,18 @@ check_cmake_style: script: tools/cmake/run_cmake_lint.sh +check_wifi_lib_md5: + stage: pre_check + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG + tags: + - build + variables: + SUBMODULES_TO_FETCH: "components/esp_wifi/lib" + dependencies: [] + script: + - IDF_TARGET=esp32 $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh + - IDF_TARGET=esp32s2beta $IDF_PATH/components/esp_wifi/test_md5/test_md5.sh + .build_with_make_and_cmake: &build_with_make_and_cmake | echo -e "section_end:"`date +%s`":build_script\r\e[0Ksection_start:"`date +%s`":build_make\r\e[0KBuild with Make" make defconfig