From d54abe16661b25ed5cd608d1f889391880b4a592 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Wed, 16 Jun 2021 14:03:00 +0800 Subject: [PATCH 1/3] ci: ci on feat & docs --- .github/workflows/node.js.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 04afae5ac..cdee5b560 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -5,9 +5,9 @@ name: Node.js CI on: push: - branches: [ main ] + branches: [ main, feat, docs ] pull_request: - branches: [ main ] + branches: [ main, feat, docs ] jobs: build: From 445e2772a874ac1e3ca31e4f278afeaa0035e93a Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Wed, 16 Jun 2021 14:13:09 +0800 Subject: [PATCH 2/3] 2.11.12 --- CHANGELOG.en-US.md | 2 +- CHANGELOG.zh-CN.md | 2 +- package.json | 2 +- src/version.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index ff6ec4aaa..ab6c74b61 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,6 +1,6 @@ # CHANGELOG -## Pending +## 2.11.12 ### Feats diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 15add3dae..4c58638e1 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,6 +1,6 @@ # CHANGELOG -## Pending +## 2.11.12 ### Feats diff --git a/package.json b/package.json index bf7dd74cd..efd19d540 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "naive-ui", - "version": "2.11.11", + "version": "2.11.12", "description": "A Vue 3 Component Library. Fairly Complete, Customizable Themes, Uses TypeScript, Not Too Slow", "main": "lib/index.js", "module": "es/index.js", diff --git a/src/version.ts b/src/version.ts index 0052b2199..df7070ca9 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export default '2.11.11' +export default '2.11.12' From d8e9622fddd8b5fe613b981a66f96ec46188d4a2 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Wed, 16 Jun 2021 14:21:52 +0800 Subject: [PATCH 3/3] docs(changelog): fix date --- CHANGELOG.en-US.md | 2 +- CHANGELOG.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index ab6c74b61..a74c54a33 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,6 +1,6 @@ # CHANGELOG -## 2.11.12 +## 2.11.12 (2020-06-16) ### Feats diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 4c58638e1..4a7246ee1 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,6 +1,6 @@ # CHANGELOG -## 2.11.12 +## 2.11.12 (2020-06-16) ### Feats