Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop-new-framework' into ne…
Browse files Browse the repository at this point in the history
…wBranch1009

# Conflicts:
#	i18n/en/docusaurus-plugin-content-docs/current/cluster-mode-quick-start.md
#	i18n/en/docusaurus-plugin-content-docs/version-1.X/cluster-mode-quick-start.md
#	i18n/en/docusaurus-plugin-content-docs/version-1.X/v2/guide/admin/cluster-mode-quick-start.md
#	i18n/en/docusaurus-plugin-content-docs/version-2.X/cluster-mode-quick-start.md
#	i18n/en/docusaurus-plugin-content-docs/version-2.X/v2/guide/admin/cluster-mode-quick-start.md
  • Loading branch information
weiguowang112 committed Oct 10, 2023
2 parents 35adfc2 + 44030b5 commit a2823aa
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 6 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/deploy-github-page.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: nacos.io deploy

on:
push:
branches:
- develop-new-framework
#This schedule only takes effect in the default branch
schedule:
- cron: '0 */12 * * *'

jobs:
Build-Deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master

- name: Use Node.js 18.x
uses: actions/setup-node@v1
with:
node-version: 18.x
- name: Build
run: |
npm install && npm run build && mkdir -p deploy-dist && cp -R build/* deploy-dist/ && mv build .htaccess deploy-dist/
- name: Deploy
uses: peaceiris/[email protected]
env:
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
PUBLISH_BRANCH: gh-pages
PUBLISH_DIR: ./deploy-dist
with:
keepFiles: true
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.idea
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ cd nacos/distribution/target/nacos-server-1.3.0/nacos/bin

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ nacos.core.auth.server.identity.value=${自定义,保证所有节点一致}

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ cd nacos/distribution/target/nacos-server-1.3.0/nacos/bin

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ nacos.core.auth.server.identity.value=${自定义,保证所有节点一致}

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ cd nacos/distribution/target/nacos-server-1.3.0/nacos/bin

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ nacos.core.auth.server.identity.value=${自定义,保证所有节点一致}

### 使用外置数据源

<!-- <span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span> -->
<span data-type="color" style="color:rgb(25, 31, 37)"><span data-type="background" style="background-color:rgb(255, 255, 255)"></span></span>
生产使用建议至少主备模式,或者采用高可用数据库。

#### 初始化 MySQL 数据库
Expand Down

0 comments on commit a2823aa

Please sign in to comment.