Skip to content

Commit

Permalink
Merge branch '3.0' into 3.0-searchbar
Browse files Browse the repository at this point in the history
  • Loading branch information
irisSong committed Nov 7, 2024
2 parents e122e64 + a291f58 commit 2e9cc4f
Show file tree
Hide file tree
Showing 9 changed files with 942 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/sync-h5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: sync to docs-h5
on:
push:
branches:
- next # default branch
- V3.0
paths:
- '.github/workflows/**'
- 'src/**'
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name : Sync
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
branch : react3x/new-site # action 应该部署到的分支 。
folder : site_docs #操作应该部署的文件夹 。
clean: false
repository-name: jdf2e/nutui-docs
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sync-migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: sync to migrate
on:
push:
branches:
- next # default branch
- V3.0
paths:
- '.github/workflows/**'
- 'src/**'
- migrate-from-v1.md
- migrate-from-v2.md
- 'package.json'

jobs:
Expand All @@ -28,13 +28,13 @@ jobs:
- name: Install dependencies
run: pnpm install

- name: Copy migrate from v1
run: node scripts/copy-migrate-from-v1.js
- name: Copy migrate from v2
run: node scripts/copy-migrate-from-v2.js

- name : Sync
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
branch : react3x/new-site # action 应该部署到的分支 。
folder : site_docs_migrate #操作应该部署的文件夹 。
clean: false
repository-name: jdf2e/nutui-docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-taro.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: sync to docs-taro
on:
push:
branches:
- next # default branch
- V3.0
paths:
- '.github/workflows/**'
- 'src/**'
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name : Sync
uses : JamesIves/github-pages-deploy-action@v4.5.0
with :
branch : new-site # action 应该部署到的分支 。
branch : react3x/new-site # action 应该部署到的分支 。
folder : site_docs #操作应该部署的文件夹 。
clean: false
repository-name: jdf2e/nutui-docs
Expand Down
Loading

0 comments on commit 2e9cc4f

Please sign in to comment.