From f303cdc70bbb6c1841a1df95d6e7a81752f003ce Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Fri, 4 Mar 2022 07:31:44 +0100
Subject: [PATCH] fix(CI): build docs & publish component failure

---
 .../publish-docs-component-websockets.yml     | 39 -------------------
 .github/workflows/publish-docs-component.yml  | 11 ++++--
 2 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/publish-docs-component-websockets.yml

diff --git a/.github/workflows/publish-docs-component-websockets.yml b/.github/workflows/publish-docs-component-websockets.yml
deleted file mode 100644
index f51df78c6..000000000
--- a/.github/workflows/publish-docs-component-websockets.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Docs and Publish Websockets
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  docs_build:
-    name: Docs-Build-And-Upload
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout esp-protocols
-        uses: actions/checkout@master
-        with:
-          persist-credentials: false
-          fetch-depth: 0
-
-      - name: Generate docs
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install doxygen clang python3-pip git
-          sudo git clone https://github.com/espressif/esp-idf
-          python -m pip install breathe recommonmark
-          python -m pip install -r esp-idf/docs/requirements.txt
-          cd $GITHUB_WORKSPACE/components/esp_websocket_client/docs
-          ./generate_docs
-          mkdir -p $GITHUB_WORKSPACE/docs/esp_websocket_client
-          cp -r html/. $GITHUB_WORKSPACE/docs/esp_websocket_client
-          cd $GITHUB_WORKSPACE/docs
-          touch .nojekyll
-          echo '<a href="esp_websocket_client/index.html">esp-websocket-client</a>' >> index.html
-
-      - name: Deploy generated docs.
-        uses: JamesIves/github-pages-deploy-action@4.1.5
-        with:
-          branch: gh-pages
-          folder: docs
diff --git a/.github/workflows/publish-docs-component.yml b/.github/workflows/publish-docs-component.yml
index 511643410..08b330994 100644
--- a/.github/workflows/publish-docs-component.yml
+++ b/.github/workflows/publish-docs-component.yml
@@ -21,20 +21,25 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install doxygen clang python3-pip
-          python -m pip install breathe recommonmark
+          python -m pip install breathe recommonmark esp-docs==0.2.1
           cd $GITHUB_WORKSPACE/components/esp_modem/docs
           ./generate_docs
           mkdir -p $GITHUB_WORKSPACE/docs/esp_modem
           cp -r html/. $GITHUB_WORKSPACE/docs/esp_modem
+          cd $GITHUB_WORKSPACE/components/esp_websocket_client/docs
+          ./generate_docs
+          mkdir -p $GITHUB_WORKSPACE/docs/esp_websocket_client
+          cp -r html/. $GITHUB_WORKSPACE/docs/esp_websocket_client
           cd $GITHUB_WORKSPACE/docs
           touch .nojekyll
           echo '<a href="esp_modem/index.html">esp-modem</a>' > index.html
+          echo '<a href="esp_websocket_client/index.html">esp-websocket-client</a>' >> index.html
+
 
       - name: Upload components to component service
         uses: espressif/github-actions/upload_components@master
         with:
-          directories: "components/esp_modem"
-          name: "esp_modem"
+          directories: "components/esp_modem;components/esp_websocket_client"
           namespace: "espressif"
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}