Update .gitlab-ci.yml file

.github/workflows/upload_component.yml

@@ -2,44 +2,32 @@ name: Push component to https://components.espressif.com
 on:
   push:
     branches:
-      - feature/esp_as_mcu_host
+      - feature/ext_component_host
 
 jobs:
-  create_components:
-    runs-on: ubuntu-latest
-    steps:
-      - run: python -m pip install --upgrade idf-component-manager
-      - run: cp -r common host/
-      - run: cp -r common slave/
-
-  upload_component_host:
+  upload_components:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: "recursive"
-
+      - run: cp -r common host/
+      - run: cp -r common slave/
+      - run: mv host esp_host
+      - run: mv slave esp_slave
+      - run: cp -rf esp_host/idf_component.yml ./
+      - run: python -m pip install --upgrade idf-component-manager
       - name: Upload host component to the component registry
         uses: espressif/upload-components-ci-action@v1
         with:
-          directories: "host"
-          name: "esp_hosted_host"
-          namespace: "mantriyogesh"
+          directories: "esp_host"
+          namespace: "espressif"
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}
-    needs: [create_components]
-
-  upload_component_slave:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-
+      - run: cp -rf esp_slave/idf_component.yml ./
       - name: Upload slave component to the component registry
         uses: espressif/upload-components-ci-action@v1
         with:
-          directories: "slave"
-          name: "esp_hosted_slave"
-          namespace: "mantriyogesh"
+          directories: "esp_slave"
+          namespace: "espressif"
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}
-    needs: [create_components]
+

.gitlab-ci.yml

@@ -109,4 +109,22 @@ deploy_esp32p4_github:
 #    - cd ../slave
 #    - compote component upload --allow-existing --name esp_hosted_slave --namespace mantriyogesh --project-dir ./
 
+deploy_ext_component_github:
+  stage: deploy
+  image: $CI_DOCKER_REGISTRY/esp32-ci-env
+  tags:
+    - deploy
+  when: manual
+  only:
+    - feature/ext_component_host
+  script:
+      - mkdir -p ~/.ssh
+      - chmod 700 ~/.ssh
+      - echo -n $GH_KEY > ~/.ssh/id_rsa_base64
+      - base64 --decode --ignore-garbage ~/.ssh/id_rsa_base64 > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+      - git remote remove github &>/dev/null || true
+      - git remote add github [email protected]:espressif/esp-hosted.git
+      - git push -f github "${CI_COMMIT_SHA}:refs/heads/${CI_COMMIT_REF_NAME}"
 

host/idf_component.yml

@@ -1,5 +1,8 @@
-version: "0.0.3"
-description: esp_hosted_master component is a part of two chip solution. master part built with any host can re-use  Wi-Fi or Bluetooth running over co-processor chip using esp_hosted_slave.
+version: "0.0.4"
+description: esp_host component is a part of two chip solution, 'esp-hosted'.
+  Any Host chipset (for example, ESP32-P4), which doesn't have native Wi-Fi and/or bluetooth support can use ESP-Hosted solution.
+  Host while building should include 'esp-host' as external component.
+  The slave chipset would be already flashed with 'esp_slave' component. This slave chipset as communication co-processor.
 dependencies:
   idf:
     version: ">=5.1"

slave/CMakeLists.txt

@@ -11,8 +11,6 @@ message(************************************************************************
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 set(APPEND EXCLUDE_COMPONENTS lwip esp_netif)
-#set(COMPONENTS main nvs_flash protocomm esp_rom)
 set(COMPONENTS esp_timer esptool_py bootloader main nvs_flash esp_rom esp_wifi protocomm )
-#set(COMPONENTS main nvs_flash protocomm esp_gdbstub) # incase gdbsub needed
 project(network_adapter)
 idf_build_set_property(COMPILE_OPTIONS "-fdiagnostics-color=always" APPEND)

slave/idf_component.yml

@@ -1,5 +1,8 @@
-version: "0.0.3"
+version: "0.0.4"
 description: esp_hosted_slave component is a part of two chip solution. slave part provides Wi-Fi or Bluetooth as co-processor to the host part.
+description: esp_slave component is a part of two chip solution, 'esp-hosted'.
+  Any ESP chipset which has native Wi-Fi and/or Bluetooth, can act as communication co-processor chip.
+  This chipset would be termed as slave chipset and would flash 'esp_slave' component.
 dependencies:
   idf:
     version: ">=5.1"