From 8f7f42948897784018b10f9d0688cc89a4a9f7cd Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Mon, 12 Jul 2021 19:59:33 +0800 Subject: [PATCH] CI: remove ESP32S2Beta related jobs --- tools/ci/config/build.yml | 11 ----------- tools/ci/config/host-test.yml | 16 ---------------- tools/ci/config/pre_check.yml | 4 ++-- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index ffed2167e7..6b0e85d9b6 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -48,12 +48,6 @@ build_ssc_esp32: variables: TARGET_NAME: "ESP32" -build_ssc_esp32s2beta: - extends: .build_ssc_template - parallel: 2 - variables: - TARGET_NAME: "ESP32S2" - build_esp_idf_tests_make: extends: .build_esp_idf_unit_test_template variables: @@ -185,11 +179,6 @@ build_examples_cmake_esp32: variables: IDF_TARGET: esp32 -build_examples_cmake_esp32s2: - extends: .build_examples_cmake - variables: - IDF_TARGET: esp32s2beta - # If you want to add new build example jobs, please add it into dependencies of `.example_test_template` .build_docs_template: &build_docs_template diff --git a/tools/ci/config/host-test.yml b/tools/ci/config/host-test.yml index b005dd24f3..164bb1e971 100644 --- a/tools/ci/config/host-test.yml +++ b/tools/ci/config/host-test.yml @@ -233,22 +233,6 @@ test_esp32_efuse_table_on_host: - cd ${IDF_PATH}/components/efuse/test_efuse_host - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ./efuse_tests.py -test_esp32s2beta_efuse_table_on_host: - extends: .host_test_template - artifacts: - when: on_failure - paths: - - components/efuse/esp32s2beta/esp_efuse_table.c - expire_in: 1 week - script: - - cd ${IDF_PATH}/components/efuse/ - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./efuse_table_gen.py -t "esp32s2beta" ${IDF_PATH}/components/efuse/esp32s2beta/esp_efuse_table.csv - - git diff --exit-code -- esp32s2beta/esp_efuse_table.c || { echo 'Differences found for esp32s2beta target. Please run make efuse_common_table or idf.py efuse_common_table and commit the changes.'; exit 1; } - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./efuse_table_gen.py -t "esp32s2beta" ${IDF_PATH}/components/efuse/esp32s2beta/esp_efuse_table.csv - - git diff --exit-code -- esp32s2beta/esp_efuse_table.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; } - - cd ${IDF_PATH}/components/efuse/test_efuse_host - - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ./efuse_tests.py - test_espcoredump: extends: .host_test_template artifacts: diff --git a/tools/ci/config/pre_check.yml b/tools/ci/config/pre_check.yml index f00c7bc7d8..da0c3aebbf 100644 --- a/tools/ci/config/pre_check.yml +++ b/tools/ci/config/pre_check.yml @@ -160,8 +160,8 @@ build_template_app: # Check if there are any stray printf/ets_printf references in WiFi libs - pushd ../components/esp_wifi/lib - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; - - for dir in esp32 esp32s2beta; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; - popd # For release tag pipelines only, make sure the tag was created with 'git tag -a' so it will update