Просмотр исходного кода

ci: fix job "check_wifi_lib_md5"

chenyudong 6 лет назад
Родитель
Сommit
a6de0e8846
2 измененных файлов с 12 добавлено и 11 удалено
  1. 0 11
      tools/ci/config/post_check.yml
  2. 12 0
      tools/ci/config/pre_check.yml

+ 0 - 11
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

+ 12 - 0
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