Skip to content

Commit ca3fce0

Browse files
docs(common): improving documentation
- update esp_modem to use esp_docs - migrated docs from github pages to docs.espressif.com
1 parent f6ff132 commit ca3fce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+149
-187
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@ show_source = True
137137
statistics = True
138138

139139
exclude =
140-
components/asio/docs/conf_common.py
140+
docs/asio/conf_common.py

.github/workflows/publish-docs-component.yml

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,66 +5,47 @@ on:
55
branches:
66
- master
77

8+
env:
9+
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_DEPLOY_URL_BASE }}
10+
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_DEPLOY_SERVER }}
11+
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_DEPLOY_SERVER_USER }}
12+
DOCS_DEPLOY_KEY: ${{ secrets.DOCS_DEPLOY_PRIVATEKEY }}
13+
DOCS_DEPLOY_PATH : ${{ secrets.DOCS_DEPLOY_PATH }}
14+
815
jobs:
916
docs_build:
1017
name: Docs-Build-And-Upload
1118
runs-on: ubuntu-latest
1219
# Skip running on forks since it won't have access to secrets
1320
if: github.repository == 'espressif/esp-protocols'
14-
1521
steps:
1622
- name: Checkout esp-protocols
1723
uses: actions/checkout@master
1824
with:
1925
persist-credentials: false
2026
fetch-depth: 0
2127
submodules: recursive
22-
2328
- name: Generate docs
29+
shell: bash
2430
run: |
25-
sudo apt-get update
26-
sudo apt-get -y install doxygen clang python3-pip
27-
python -m pip install breathe recommonmark esp-docs
28-
cd $GITHUB_WORKSPACE/components/esp_modem/docs
29-
./generate_docs
30-
mkdir -p $GITHUB_WORKSPACE/docs/esp_modem
31-
cp -r html/. $GITHUB_WORKSPACE/docs/esp_modem
32-
33-
cd $GITHUB_WORKSPACE/components/esp_websocket_client/docs
34-
./generate_docs
35-
mkdir -p $GITHUB_WORKSPACE/docs/esp_websocket_client
36-
cp -r html/. $GITHUB_WORKSPACE/docs/esp_websocket_client
37-
38-
cd $GITHUB_WORKSPACE/components/mdns/docs
39-
./generate_docs
40-
mkdir -p $GITHUB_WORKSPACE/docs/mdns/en
41-
mkdir -p $GITHUB_WORKSPACE/docs/mdns/zh_CN
42-
cp -r html_en/. $GITHUB_WORKSPACE/docs/mdns/en
43-
cp -r html_zh_CN/. $GITHUB_WORKSPACE/docs/mdns/zh_CN
44-
45-
cd $GITHUB_WORKSPACE/components/asio/docs
46-
./generate_docs
47-
mkdir -p $GITHUB_WORKSPACE/docs/asio
48-
cp -r html/. $GITHUB_WORKSPACE/docs/asio
49-
50-
cd $GITHUB_WORKSPACE/docs
51-
touch .nojekyll
52-
echo '<a href="esp_modem/index.html">esp-modem</a><br>' > index.html
53-
echo '<a href="esp_websocket_client/index.html">esp-websocket-client</a><br>' >> index.html
54-
echo '<a href="asio/index.html">ASIO</a><br>' >> index.html
55-
echo '<a href="mdns/en/index.html">mDNS_en</a><br>' >> index.html
56-
echo '<a href="mdns/zh_CN/index.html">mDNS_zh_CN</a><br>' >> index.html
57-
58-
31+
sudo apt-get update
32+
sudo apt-get -y install doxygen clang python3-pip
33+
python -m pip install breathe recommonmark esp-docs==1.4.1
34+
cd $GITHUB_WORKSPACE/docs
35+
./generate_docs
36+
- name: Deploying generated docs
37+
if: always()
38+
shell: bash
39+
run: |
40+
source $GITHUB_WORKSPACE/docs/utils.sh
41+
add_doc_server_ssh_keys $DOCS_DEPLOY_KEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
42+
export GIT_VER=$(git describe --always)
43+
export GITHUB_REF_NAME=latest
44+
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs
45+
deploy-docs
5946
- name: Upload components to component service
6047
uses: espressif/github-actions/upload_components@master
6148
with:
6249
directories: "components/esp_modem;components/esp_websocket_client;components/mdns;components/asio"
6350
namespace: "espressif"
6451
api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}
65-
66-
- name: Deploy generated docs
67-
uses: JamesIves/github-pages-deploy-action@4.1.5
68-
with:
69-
branch: gh-pages
70-
folder: docs

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
# Collection of protocol components for ESP-IDF
22

3-
[Documentation of esp-protocol](https://espressif.github.io/esp-protocols)
4-
53
## Components
64

75
### esp_modem
86

97
* Brief introduction [README](components/esp_modem/README.md)
10-
* Full html [documentation](https://espressif.github.io/esp-protocols/esp_modem/index.html)
8+
* Full html [documentation](https://docs.espressif.com/projects/esp-protocols/docs/latest/esp_modem/index.html)
119

1210
### mDNS
1311

1412
* Brief introduction [README](components/mdns/README.md)
15-
* Full html [documentation(English)](https://espressif.github.io/esp-protocols/mdns/en/index.html)
16-
* Full html [documentation(Chinese)](https://espressif.github.io/esp-protocols/mdns/zh_CN/index.html)
13+
* Full html [documentation(English)](https://docs.espressif.com/projects/esp-protocols/mdns/latest/en/index.html)
14+
* Full html [documentation(Chinese)](https://docs.espressif.com/projects/esp-protocols/mdns/latest/zh_CN/index.html)
1715

1816
### esp_websocket_client
1917

2018
* Brief introduction [README](components/esp_websocket_client/README.md)
21-
* Full html [documentation](https://espressif.github.io/esp-protocols/esp_websocket_client/index.html)
19+
* Full html [documentation](https://docs.espressif.com/projects/esp-protocols/docs/latest/esp_websocket_client/index.html)
2220

2321
### ASIO port
2422

2523
* Brief introduction [README](components/asio/README.md)
26-
* Full html [documentation](https://espressif.github.io/esp-protocols/asio/index.html)
24+
* Full html [documentation](https://docs.espressif.com/projects/esp-protocols/docs/latest/asio/index.html)

ci/check_copyright_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ slim_modem_examples:
5757
ignore:
5858
perform_check: no
5959
include:
60-
- 'components/**/docs/**'
60+
- '**/docs/**'
6161
- 'components/esp_modem/port/linux/**'
6262
- 'components/asio/examples/**'
6363
- 'components/mdns/**/esp_system_protocols_linux/**'

components/esp_modem/docs/generate_docs

Lines changed: 0 additions & 23 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)