Skip to content

Commit

Permalink
Merge branch 'main' into fix/#689
Browse files Browse the repository at this point in the history
  • Loading branch information
MikuroXina authored Feb 3, 2023
2 parents 321092e + 01bde80 commit 42f5a4f
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: バグ報告
description: OreOreBot2のバグを報告する
labels: ["bug"]
labels: ["C-bug"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 機能要望
description: OreOreBot2の機能の要望を行う
labels: ["enhancement"]
labels: ["C-enhancement"]
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
workflow (gh-actions):
C-GitHub Actions:
- .github/workflows/*.yml
85 changes: 47 additions & 38 deletions .github/labels.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,50 @@
# OreOreBot2 Label-File
# OreOreBot2 ラベルファイル
# ラベル等の編集はこのファイルを編集してください。 main ブランチ更新後 CI が動き出し同期を開始します。

# C - Category
- name: 'C-bug'
description: 'Category: bug'
color: '8ec1f5'
- name: 'C-security'
description: 'Category: security'
color: '8ec1f5'
- name: 'C-enhancement'
description: 'Category: enhancement'
color: '8ec1f5'
- name: 'C-cleanup'
description: 'Category: cleanup within codebase'
color: '8ec1f5'
- name: 'C-GitHub Actions'
description: 'Category: GitHub Actions'
color: '8ec1f5'
- name: 'C-improvement'
description: 'Category: improvement'
color: '8ec1f5'
- name: 'C-development'
description: 'Category: development'
color: '8ec1f5'

# P - Priority
- name: 'P-high'
description: 'Priority: High'
color: 'f79d6d'

# R - Renovate

- name: 'R-Update(docker)'
description: 'Renovate: update docker-image'
color: '4d68b3'
- name: 'R-Update(gh-actions)'
description: 'Renovate: update workflow'
color: '4d68b3'
- name: 'R-Update(npm)'
description: 'Renovate: update npm'
color: '4d68b3'

- name: 'not compatible'
color: 'd4d4d4'
- name: 'duplicate'
color: 'f0dc59'
- name: 'invalid'
color: 'f0dc59'
- name: 'wrong'
color: 'f0dc59'
- name: 'high'
color: 'fc032c'
- name: 'low'
color: 'f7b2bd'
- name: 'bug'
color: 'ff0026'
- name: 'security'
color: 'ff0026'
- name: 'design'
color: 'ee9cff'
- name: 'improvement'
color: 'ee9cff'
- name: 'enhancement'
color: 'ee9cff'
- name: 'documentation'
color: 'ee9cff'
- name: 'workflow (gh-actions)'
color: 'ee9cff'
- name: 'renovate: update(npm)'
color: 'ee9cff'
- name: 'renovate: update(gh-actions)'
color: 'ee9cff'
- name: 'renovate: update(docker)'
color: 'ee9cff'
- name: 'no context'
color: 'f0dc59'
- name: 'good first issue'
color: '69f5a8'
- name: 'Need more Hibikiness'
description: 'I need more Hibikiness in the message'
color: 'DEAFEE'
color: '00b7c4'
- name: 'Help wanted'
color: 'ab7aeb'
- name: 'good first issue'
color: 'ab7aeb'
8 changes: 4 additions & 4 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
"packageRules": [
{
"matchDatasources": ["npm"],
"labels": ["renovate: update(npm)"]
"labels": ["R-Update(npm)"]
},
{
"matchDatasources": ["github-actions"],
"labels": ["renovate: update(gh-actions)"]
"labels": ["R-Update(gh-actions)"]
},
{
"matchDatasources": ["dockerfile", "docker-compose"],
"labels": ["renovate: update(docker)"]
"labels": ["R-Update(Docker)"]
}
],
"npm": {
Expand All @@ -31,7 +31,7 @@
"vulnerabilityAlerts": {
"enabled": true,
"automerge": true,
"labels": ["security"],
"labels": ["C-security"],
"assignees": [
"m2en", "MikuroXina"
]
Expand Down

0 comments on commit 42f5a4f

Please sign in to comment.