Skip to content

Commit 2e9cc4f

Browse files
committed
Merge branch '3.0' into 3.0-searchbar
2 parents e122e64 + a291f58 commit 2e9cc4f

9 files changed

Lines changed: 942 additions & 15 deletions

File tree

.github/workflows/sync-h5.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: sync to docs-h5
33
on:
44
push:
55
branches:
6-
- next # default branch
6+
- V3.0
77
paths:
88
- '.github/workflows/**'
99
- 'src/**'
@@ -33,7 +33,7 @@ jobs:
3333
- name : Sync
3434
uses : JamesIves/github-pages-deploy-action@v4.5.0
3535
with :
36-
branch : new-site # action 应该部署到的分支 。
36+
branch : react3x/new-site # action 应该部署到的分支 。
3737
folder : site_docs #操作应该部署的文件夹 。
3838
clean: false
3939
repository-name: jdf2e/nutui-docs

.github/workflows/sync-migrate.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: sync to migrate
33
on:
44
push:
55
branches:
6-
- next # default branch
6+
- V3.0
77
paths:
88
- '.github/workflows/**'
99
- 'src/**'
10-
- migrate-from-v1.md
10+
- migrate-from-v2.md
1111
- 'package.json'
1212

1313
jobs:
@@ -28,13 +28,13 @@ jobs:
2828
- name: Install dependencies
2929
run: pnpm install
3030

31-
- name: Copy migrate from v1
32-
run: node scripts/copy-migrate-from-v1.js
31+
- name: Copy migrate from v2
32+
run: node scripts/copy-migrate-from-v2.js
3333

3434
- name : Sync
3535
uses : JamesIves/github-pages-deploy-action@v4.5.0
3636
with :
37-
branch : new-site # action 应该部署到的分支 。
37+
branch : react3x/new-site # action 应该部署到的分支 。
3838
folder : site_docs_migrate #操作应该部署的文件夹 。
3939
clean: false
4040
repository-name: jdf2e/nutui-docs

.github/workflows/sync-taro.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: sync to docs-taro
33
on:
44
push:
55
branches:
6-
- next # default branch
6+
- V3.0
77
paths:
88
- '.github/workflows/**'
99
- 'src/**'
@@ -33,7 +33,7 @@ jobs:
3333
- name : Sync
3434
uses : JamesIves/github-pages-deploy-action@v4.5.0
3535
with :
36-
branch : new-site # action 应该部署到的分支 。
36+
branch : react3x/new-site # action 应该部署到的分支 。
3737
folder : site_docs #操作应该部署的文件夹 。
3838
clean: false
3939
repository-name: jdf2e/nutui-docs

0 commit comments

Comments
 (0)