Merge branch 'ci/update_tags' into 'master'

ci(pre_check): update tags

See merge request ae_group/esp-iot-solution!1410

Author: Horion0415

.github/workflows/upload_component.yml

@@ -12,6 +12,16 @@ jobs:
       - uses: actions/checkout@master
         with:
           submodules: 'recursive'
+      - name: Copy common components to examples
+        run: |
+          mkdir -p examples/display/gui/lvgl_common_demo/components/
+          cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_common_demo/components/
+          mkdir -p examples/display/gui/lvgl_decode_image/components/
+          cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_decode_image/components/
+          mkdir -p examples/display/gui/lvgl_dummy_draw/components/
+          cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_dummy_draw/components/
+          mkdir -p examples/display/gui/lvgl_freetype_font/components/
+          cp -r examples/display/gui/common/hw_init examples/display/gui/lvgl_freetype_font/components/
       - name: Upload components to component service
         uses: espressif/upload-components-ci-action@v1
         with:
@@ -54,6 +64,7 @@ jobs:
             components/display/lcd_touch/esp_lcd_touch_st7123;
             components/display/tools/esp_lv_decoder;
             components/display/tools/esp_lv_fs;
+            components/display/tools/esp_lvgl_adapter;
             components/display/tools/esp_mmap_assets;
             components/elf_loader;
             components/expander/io_expander/mcp23017;

.gitlab/ci/pre_check.yml

@@ -1,22 +1,13 @@
 .pre_check_template:
   stage: pre_check
-  image: python:3.9
-  tags: ["build", "amd64", "internet"]
+  image: python:3.12
   dependencies: []
 
-check_copyright:
-  extends:
-    - .pre_check_template
-  allow_failure: false
-  before_script:
-    - pip install git+https://github.com/espressif/[email protected]
-  script:
-    - python -m check_copyright --verbose --dry-run --ignore tools/ci/check_copyright_ignore.txt --config tools/ci/check_copyright_config.yaml .
-
 check_example_paths:
   extends:
     - .pre_check_template
     - .rules:pre_check:components
+  tags: ["shiny"]
   script:
     - pip install --upgrade pip
     - pip install pyyaml
@@ -33,6 +24,7 @@ check_pre_commit:
       allow_failure: true
     - when: always
       allow_failure: false
+  tags: ["pre-commit"]
   script:
     - |
       # merged results pipelines, by default
@@ -48,13 +40,13 @@ check_pre_commit:
       # print the MODIFIED_FILES
       echo "MODIFIED_FILES: $MODIFIED_FILES"
     - pre-commit install --allow-missing-config -t pre-commit -t commit-msg
-    - export SKIP=check-copyright # copyrights has been checked in separate job
     - pre-commit run --files $MODIFIED_FILES
 
 check_readme_links:
   extends:
     - .pre_check_template
     - .rules:pre_check:readme
+  tags: ["build", "internet"]
   allow_failure: true
   script:
     - python ${CI_PROJECT_DIR}/tools/ci/check_readme_links.py

README.md

@@ -104,6 +104,7 @@ The registered components in ESP-IoT-Solution are listed below:
 | [esp_lcd_usb_display](https://components.espressif.com/components/espressif/esp_lcd_usb_display) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_usb_display/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_usb_display) |
 | [esp_lv_decoder](https://components.espressif.com/components/espressif/esp_lv_decoder) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lv_decoder/badge.svg)](https://components.espressif.com/components/espressif/esp_lv_decoder) |
 | [esp_lv_fs](https://components.espressif.com/components/espressif/esp_lv_fs) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lv_fs/badge.svg)](https://components.espressif.com/components/espressif/esp_lv_fs) |
+| [esp_lvgl_adapter](https://components.espressif.com/components/espressif/esp_lvgl_adapter) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lvgl_adapter/badge.svg)](https://components.espressif.com/components/espressif/esp_lvgl_adapter) |
 | [esp_mmap_assets](https://components.espressif.com/components/espressif/esp_mmap_assets) | [![Component Registry](https://components.espressif.com/components/espressif/esp_mmap_assets/badge.svg)](https://components.espressif.com/components/espressif/esp_mmap_assets) |
 | [esp_msc_ota](https://components.espressif.com/components/espressif/esp_msc_ota) | [![Component Registry](https://components.espressif.com/components/espressif/esp_msc_ota/badge.svg)](https://components.espressif.com/components/espressif/esp_msc_ota) |
 | [esp_sensorless_bldc_control](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control) | [![Component Registry](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control/badge.svg)](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control) |

README_CN.md

@@ -107,6 +107,7 @@ ESP-IoT-Solution 中注册的组件如下:
 | [esp_lcd_usb_display](https://components.espressif.com/components/espressif/esp_lcd_usb_display) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lcd_usb_display/badge.svg)](https://components.espressif.com/components/espressif/esp_lcd_usb_display) |
 | [esp_lv_decoder](https://components.espressif.com/components/espressif/esp_lv_decoder) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lv_decoder/badge.svg)](https://components.espressif.com/components/espressif/esp_lv_decoder) |
 | [esp_lv_fs](https://components.espressif.com/components/espressif/esp_lv_fs) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lv_fs/badge.svg)](https://components.espressif.com/components/espressif/esp_lv_fs) |
+| [esp_lvgl_adapter](https://components.espressif.com/components/espressif/esp_lvgl_adapter) | [![Component Registry](https://components.espressif.com/components/espressif/esp_lvgl_adapter/badge.svg)](https://components.espressif.com/components/espressif/esp_lvgl_adapter) |
 | [esp_mmap_assets](https://components.espressif.com/components/espressif/esp_mmap_assets) | [![Component Registry](https://components.espressif.com/components/espressif/esp_mmap_assets/badge.svg)](https://components.espressif.com/components/espressif/esp_mmap_assets) |
 | [esp_msc_ota](https://components.espressif.com/components/espressif/esp_msc_ota) | [![Component Registry](https://components.espressif.com/components/espressif/esp_msc_ota/badge.svg)](https://components.espressif.com/components/espressif/esp_msc_ota) |
 | [esp_sensorless_bldc_control](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control) | [![Component Registry](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control/badge.svg)](https://components.espressif.com/components/espressif/esp_sensorless_bldc_control) |

tools/ci/check_components.py

@@ -32,7 +32,7 @@ def check_example_paths(component_path):
 def check_component_paths(file_path):
     with open(file_path, 'r') as f:
         data = yaml.safe_load(f)
-        directories = data['jobs']['upload_components']['steps'][1]['with']['directories'].strip().split(';')
+        directories = data['jobs']['upload_components']['steps'][2]['with']['directories'].strip().split(';')
 
         for directory in directories:
             if directory.strip():

tools/release_versions.py

@@ -35,7 +35,7 @@ def get_components_versions(path):
 with open(os.path.join(os.path.dirname(__file__), '../.github/workflows/upload_component.yml'), 'r') as file:
     data = yaml.safe_load(file)
 # Extract the directories string
-upload_directories = data['jobs']['upload_components']['steps'][1]['with']['directories']
+upload_directories = data['jobs']['upload_components']['steps'][2]['with']['directories']
 # Split the directories string into a list of components
 upload_components = [component.split('/')[-1] for component in upload_directories.split(';') if component]