Переглянути джерело

fix(ci): modify deploy_docs.yaml

Signed-off-by: Swilder-M <poxiaobbs@gmail.com>
Swilder-M 3 роки тому
батько
коміт
806a87a453

+ 26 - 27
.github/workflows/deploy_docs.yaml

@@ -25,7 +25,7 @@ jobs:
     - name: clone frontend
       uses: actions/checkout@v2
       with:
-        repository: 'emqx/docs-emqx-com-frontend'
+        repository: 'emqx/emqx-io-docs-frontend'
         token: ${{ secrets.CI_GIT_TOKEN }}
         path: frontend
 
@@ -50,7 +50,7 @@ jobs:
          fi
          echo "DOCS_BRANCH=$BRANCH" >> $GITHUB_ENV
          echo "VERSION=$VERSION" >> $GITHUB_ENV
-         echo "DOCS_TYPE=kuiper" >> $GITHUB_ENV
+         echo "DOCS_TYPE=ekuiper" >> $GITHUB_ENV
 
     - name: remove unused files
       run: |
@@ -63,11 +63,11 @@ jobs:
         rm frontend/docs/zh/README.md || true
         rm frontend/docs/*.md || true
         rm frontend/README.md
-        mkdir -p frontend/docs/en/${DOCS_TYPE}/${VERSION}/
-        mkdir -p frontend/docs/zh/${DOCS_TYPE}/${VERSION}/
+        mkdir -p frontend/docs/en/${VERSION}/
+        mkdir -p frontend/docs/zh/${VERSION}/
         mkdir -p frontend/docs/.vuepress/public/api/
-        cp -r docs-files/docs/en_US/* frontend/docs/en/${DOCS_TYPE}/${VERSION}/
-        cp -r docs-files/docs/zh_CN/* frontend/docs/zh/${DOCS_TYPE}/${VERSION}/
+        cp -r docs-files/docs/en_US/* frontend/docs/en/${VERSION}/
+        cp -r docs-files/docs/zh_CN/* frontend/docs/zh/${VERSION}/
         cp docs-files/docs/directory.json frontend/docs/.vuepress/config/directory.json
         echo "[\"latest\"]" > frontend/docs/.vuepress/public/api/${DOCS_TYPE}_versions.json
 
@@ -78,43 +78,42 @@ jobs:
 
     - name: upload dist
       run: |
-        pip3 install coscmd
-        coscmd config -a ${{ secrets.COS_ID }} -s ${{ secrets.COS_KEY }} -b ${{ secrets.COS_NAME }} -r ${{ secrets.COS_REGION }}
-        coscmd delete -r -f en/${DOCS_TYPE}/${VERSION} || true
-        coscmd delete -r -f zh/${DOCS_TYPE}/${VERSION} || true
-        coscmd config -a ${{ secrets.COS_ID }} -s ${{ secrets.COS_KEY }} -b ${{ secrets.COS_NAME }} -e cos.accelerate.myqcloud.com
-        cd frontend/docs/.vuepress/dist/
-        zip -rq docs-dist-${DOCS_TYPE}-${VERSION}.zip ./
-        coscmd upload docs-dist-${DOCS_TYPE}-${VERSION}.zip docs-zip/
-        sleep 90
-
-    - name: flush cdn
-      run: |
-        pip3 install tccli
-        tccli configure set secretId ${{ secrets.COS_ID }}
-        tccli configure set secretKey ${{ secrets.COS_KEY }}
-        tccli configure set region ${{ secrets.COS_REGION }}
-        tccli cdn PurgePathCache --cli-unfold-argument --Paths https://docs.emqx.com/zh/${DOCS_TYPE}/${VERSION}/ https://docs.emqx.com/en/${DOCS_TYPE}/${VERSION}/ --FlushType delete
-        tccli cdn PurgeUrlsCache --cli-unfold-argument --Urls https://docs.emqx.com/api/${DOCS_TYPE}_versions.json https://docs.emqx.com/sitemap_${DOCS_TYPE}_${VERSION}.xml
+        cd frontend/docs/.vuepress/
+        wget http://gosspublic.alicdn.com/ossutil/1.7.8/ossutil64
+        chmod 755 ./ossutil64
+        ./ossutil64 config -e https://oss-accelerate.aliyuncs.com -i ${{ secrets.ALI_OSS_ACCESSKEY_ID }} -k ${{ secrets.ALI_OSS_ACCESSKEY_SECRET }} -L CH
+        ./ossutil64 rm -r -f oss://ekuiper-org/docs/zh/${VERSION}/
+        ./ossutil64 rm -r -f oss://ekuiper-org/docs/en/${VERSION}/
+        ./ossutil64 cp -r dist/ oss://ekuiper-org/docs/ -u
+
+    - name: refresh cdn cache
+      uses: Swilder-M/refresh-ali-cdn@v1
+      with:
+        access_key_id: ${{ secrets.ALI_OSS_ACCESSKEY_ID }}
+        access_key_secret: ${{ secrets.ALI_OSS_ACCESSKEY_SECRET }}
+        file_paths: https://ekuiper.org/docs/ 
 
     - name: clone docsearch
+      if: env.VERSION == 'latest'
       uses: actions/checkout@v2
       with:
         repository: 'Swilder-M/docsearch-scraper-simple'
         path: docsearch
 
     - name: install pipenv
+      if: env.VERSION == 'latest'
       run: |
           python -m pip install --upgrade pipenv wheel
 
     - id: cache-pipenv
+      if: env.VERSION == 'latest'
       uses: actions/cache@v1
       with:
         path: ~/.local/share/virtualenvs
         key: ${{ runner.os }}-pipenv-${{ hashFiles('**/Pipfile.lock') }}
 
     - name: install dependencies
-      if: steps.cache-pipenv.outputs.cache-hit != 'true'
+      if: env.VERSION == 'latest' && steps.cache-pipenv.outputs.cache-hit != 'true'
       run: |
         cd docsearch
         pipenv install --keep-outdated
@@ -122,8 +121,8 @@ jobs:
     - name: update current version
       if: env.VERSION == 'latest'
       env:
-        APPLICATION_ID: ${{ secrets.DOCS_APPLICATION_ID }}
-        API_KEY: ${{ secrets.DOCS_API_KEY }}
+        APPLICATION_ID: ${{ secrets.ALGOLIA_APPLICATION_ID }}
+        API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
       run: |
         cd docsearch
         pipenv run python -m src.index config ${DOCS_TYPE} ${VERSION}

+ 4 - 4
docs/en_US/README.md

@@ -43,9 +43,9 @@ It can be run at various IoT edge use scenarios, such as real-time processing of
   - Plugins, streams and rules management through CLI & REST API
   - Easily be integrate with [KubeEdge](https://github.com/kubeedge/kubeedge), [K3s](https://github.com/rancher/k3s) and [Baetyl](https://github.com/baetyl/baetyl), which bases Kubernetes
 
-- Integration with EMQ X Edge
+- Integration with EMQX Edge
 
-  Seamless integration with EMQ X Neuron & EMQ X Edge, and provided an end to end solution from messaging to analytics. 
+  Seamless integration with EMQX Neuron & EMQX Edge, and provided an end to end solution from messaging to analytics. 
 
 ## Quick start
 
@@ -59,8 +59,8 @@ Join our [Slack](https://join.slack.com/t/lfedge/shared_invite/zt-7kavdtmq-SeyFz
 
 ### MQTT throughput test
 
-- Using JMeter MQTT plugin to send simulation data to EMQ X Broker, such as: `{"temperature": 10, "humidity" : 90}`, the value of temperature and humidity are random integer between 0 - 100.
-- eKuiper subscribe from EMQ X Broker, and analyze data with SQL: `SELECT * FROM demo WHERE temperature > 50 ` 
+- Using JMeter MQTT plugin to send simulation data to EMQX Broker, such as: `{"temperature": 10, "humidity" : 90}`, the value of temperature and humidity are random integer between 0 - 100.
+- eKuiper subscribe from EMQX Broker, and analyze data with SQL: `SELECT * FROM demo WHERE temperature > 50 ` 
 - The analysis result are wrote to local file by using [file sink plugin](extension/native/sinks/file.md).
 
 | Devices                                        | Message # per second | CPU usage     | Memory usage |

+ 4 - 4
docs/zh_CN/README.md

@@ -43,9 +43,9 @@ eKuiper 可以运行在各类物联网的边缘使用场景中,比如工业物
   - 通过命令行和 REST API 对流、规则和插件进行管理
   - 与 [KubeEdge](https://github.com/kubeedge/kubeedge)、[K3s](https://github.com/rancher/k3s)、[Baetyl](https://github.com/baetyl/baetyl) 等基于边缘 Kubernetes 框架的集成能力
 
-- 与 EMQ X Edge 集成
+- 与 EMQX Edge 集成
 
-  提供了与 EMQ X Neuron 和 EMQ X Edge 的无缝集成,实现在边缘端从消息接入到数据分析端到端的场景实现能力
+  提供了与 EMQX Neuron 和 EMQX Edge 的无缝集成,实现在边缘端从消息接入到数据分析端到端的场景实现能力
 
 ## 快速入门
 
@@ -59,8 +59,8 @@ eKuiper 可以运行在各类物联网的边缘使用场景中,比如工业物
 
 ### MQTT 吞吐量测试支持
 
-- 使用 JMeter MQTT 插件来发送数据到 EMQ X 服务器,消息类似于 `{"temperature": 10, "humidity" : 90}`, 温度与湿度的值是介于 0 ~ 100 之间的随机整数值
-- eKuiper 从 EMQ X 服务器订阅消息,并且通过 SQL 分析数据: `SELECT * FROM demo WHERE temperature > 50 ` 
+- 使用 JMeter MQTT 插件来发送数据到 EMQX 服务器,消息类似于 `{"temperature": 10, "humidity" : 90}`, 温度与湿度的值是介于 0 ~ 100 之间的随机整数值
+- eKuiper 从 EMQX 服务器订阅消息,并且通过 SQL 分析数据: `SELECT * FROM demo WHERE temperature > 50 ` 
 - 分析结果通过 [文件插件](extension/native/sinks/file.md) 写到本地的文件系统里
 
 | 设备                                                 | 每秒发送消息数 | CPU 使用        | 内存 |

+ 1 - 1
docs/zh_CN/getting_started.md

@@ -90,7 +90,7 @@ eKuiper 具有许多用于复杂分析的内置函数和扩展,您可以访问
 
 ### 先决条件
 
-我们假设已经有一个 MQTT 消息服务器作为 eKuiper 服务器的数据源。 如果您没有,建议使用 EMQ X。 请按照 [EMQ Broker 安装指南](https://docs.emqx.cn/cn/broker/latest/getting-started/install.html)设置 MQTT 消息服务器。
+我们假设已经有一个 MQTT 消息服务器作为 eKuiper 服务器的数据源。 如果您没有,建议使用 EMQX。 请按照 [EMQ Broker 安装指南](https://docs.emqx.cn/cn/broker/latest/getting-started/install.html)设置 MQTT 消息服务器。
 
 ### 定义输入流