Skip to content

Commit

Permalink
Merge xpoet/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
XilongYang committed Oct 25, 2023
2 parents 72a969d + 0a30fc4 commit 18aee16
Show file tree
Hide file tree
Showing 134 changed files with 5,147 additions and 2,410 deletions.
23 changes: 23 additions & 0 deletions .commitlintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
extends: ['@commitlint/config-conventional'],
rules: {
'type-enum': [
2,
'always',
[
'feat',
'fix',
'docs',
'style',
'refactor',
'perf',
'test',
'build',
'revert',
'ci',
'ui',
'chore'
]
]
}
}
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: ['https://cdn.staticaly.com/gh/XPoet/image-hosting@master/FE-Cheerleaders/play-tour.png']
custom: ['https://xpoet.cn/images/reward.png']
115 changes: 115 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: Bug Report | Bug 报告
description: Something isn't working as expected
#title: ""
labels:
- bug
#assignees: ""
body:
- type: markdown
id: overall
attributes:
value: |
Please follow this Issue template to provide relevant information, such as source code repository, website URL and screenshots, which will help us investigate.
请按照此 Issue 模版提供相关信息,例如源码仓库、网站链接和屏幕截图,这将有助于我们进行调查。
- type: checkboxes
id: checklist
attributes:
label: Issue Checklist | Issue 检查清单
description: |
I made sure I checked
我确认我已经检查过了
options:
- label: I am using Keep version 3.8.5 or later.
required: true
- label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn).
required: true
- label: I have already searched for current [issues](https://github.com/XPoet/hexo-theme-keep/issues), which does not help me.
required: true

- type: textarea
id: expected-behavior
attributes:
label: Expected behavior | 预期行为
description: |
Please provide a detailed description of what you consider expected behavior.
请仔细描述你认为的预期行为
validations:
required: true

- type: textarea
id: actual-behavior
attributes:
label: Actual behavior | 实际行为
description: |
Please provide the following information
请提供以下信息
value: |
- Links to demo site with this issue:
- Links to repository or source code of the blog:
- Screenshots:
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the behavior | 重现步骤
description: |
Please provide a detailed description of the steps to reproduce the issue
请仔细描述重现步骤
value: |
1. First step ...
2. Second step ...
3. Third step ...
validations:
required: true

- type: markdown
id: env
attributes:
value: |
## Environment Information | 环境信息
- type: textarea
id: nodejs-info
attributes:
label: Node.js and NPM Information | Node.js 和 NPM 信息
description: |
Paste output from `node -v && npm -v`
粘贴 `node -v && npm -v` 输出的信息
render: Text
validations:
required: true

- type: textarea
id: hexo-config
attributes:
label: Hexo Configuration | Hexo 配置
description: |
"Paste configuration from Hexo `_config.yml`
粘贴 Hexo `_config.yml` 中的内容
render: YAML
validations:
required: true

- type: textarea
id: keep-config
attributes:
label: Keep Configuration | Keep 配置
description: |
Paste ONLY CHANGED CONFIGURATION from Keep `_config.yml`
只粘贴 Keep 主题配置文件 `_config.yml` 中修改过的部分
render: YAML
validations:
required: true

- type: textarea
id: other-info
attributes:
label: Other Information | 其它信息
description: |
e.g. Browser, System
例如:浏览器,操作系统
validations:
required: false
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: GitHub Discussions
url: https://github.com/XPoet/hexo-theme-keep/discussions
about: Please ask and answer questions here.
52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Feature Request | 功能需求
description: Suggest an idea for this project
#title: ""
labels:
- feature request
#assignees: ""
body:
- type: markdown
id: overall
attributes:
value: |
Please follow this Issue template to provide relevant information, such as source code repository, website URL and screenshots, which will help us investigate.
请按照此 Issue 模版提供相关信息,例如源码仓库、网站链接和屏幕截图,这将有助于我们进行调查。
- type: checkboxes
id: checklist
attributes:
label: Issue Checklist | Issue 检查清单
description: |
I made sure I checked
我确认我已经检查过了
options:
- label: I am using Keep version 3.8.5 or later.
required: true
- label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn).
required: true
- label: I have already searched for current [issues](https://github.com/XPoet/hexo-theme-keep/issues), which does not help me.
required: true

- type: textarea
id: feature-request
attributes:
label: Feature Request | 功能需求
description: |
Please provide the following information
请提供以下信息
value: |
- Detailed description of feature request:
- This feature request reference link:
- This feature request reference screenshots:
validations:
required: true

- type: textarea
id: other-info
attributes:
label: Other Information | 其它信息
description: |
Additional information
补充其它信息
validations:
required: false
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/other.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Other | 其他
description: Not a feature request or bug report
#title: ""
labels:
- question
#assignees: ""
body:
- type: markdown
id: overall
attributes:
value: |
Please follow this Issue template to provide relevant information, such as source code repository, website URL and screenshots, which will help us investigate.
请按照此 Issue 模版提供相关信息,例如源码仓库、网站链接和屏幕截图,这将有助于我们进行调查。
- type: checkboxes
id: checklist
attributes:
label: Issue Checklist | Issue 检查清单
description: |
I made sure I checked
我确认我已经检查过了
options:
- label: I am using Keep version 3.8.5 or later.
required: true
- label: I have already read the [Troubleshooting page of Hexo](https://hexo.io/docs/troubleshooting) and [Keep documents](https://keep-docs.xpoet.cn).
required: true
- label: I have already searched for current [issues](https://github.com/XPoet/hexo-theme-keep/issues), which does not help me.
required: true

- type: textarea
id: other-info
attributes:
label: Other Information | 其它信息
description: |
Feedback other questions
反馈其它的问题
validations:
required: true
29 changes: 29 additions & 0 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- id: automerge
name: automerge
uses: pascalgn/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
MERGE_LABELS: "autorelease: pending"
19 changes: 0 additions & 19 deletions .github/workflows/npm-publish.yml

This file was deleted.

98 changes: 98 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
on:
push:
branches:
- master

name: release

jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: google-github-actions/release-please-action@v3
id: release
with:
token: ${{ secrets.ACTIONS_TOKEN }}
release-type: node
package-name: standard-version
changelog-types: '[
{
"type": "feat",
"section": "🌟 Features",
"hidden": false
},
{
"type": "fix",
"section": "🐞 Bug Fixes",
"hidden": false
},
{
"type": "docs",
"section": "📖 Docs",
"hidden": false
},
{
"type": "style",
"section": "🎨 Styling",
"hidden": false
},
{
"type": "refactor",
"section": "🍭 Code Refactoring",
"hidden": false
},
{
"type": "perf",
"section": "🛠 Performance Improvements",
"hidden": false
},
{
"type": "test",
"section": "🚧 Tests",
"hidden": false
},
{
"type": "build",
"section": "📦 Build System",
"hidden": false
},
{
"type": "revert",
"section": "🌀 Reverts",
"hidden": false
},
{
"type": "ci",
"section": "🎯 CI",
"hidden": false
},
{
"type": "ui",
"section": "💄 Improvement UI",
"hidden": false
},
{
"type": "chore",
"section": "🚦 Chore",
"hidden": false
}
]'

# The logic below handles the npm publication

- uses: actions/checkout@v2
if: ${{ steps.release.outputs.release_created }}

- uses: actions/setup-node@v1
with:
node-version: 16
registry-url: https://registry.npmjs.org
if: ${{ steps.release.outputs.release_created }}

- run: npm install
if: ${{ steps.release.outputs.release_created }}

- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_PUBLISH_TOKEN}}
if: ${{ steps.release.outputs.release_created }}
4 changes: 4 additions & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx commitlint --edit
Loading

0 comments on commit 18aee16

Please sign in to comment.