Merge branch 'main' into main-fix
This commit is contained in:
17
.github/pull_request_template.md
vendored
Normal file
17
.github/pull_request_template.md
vendored
Normal file
@@ -0,0 +1,17 @@
|
||||
<!-- 提交前必读 -->
|
||||
- 🔴**当前项目处于重构阶段(2025.3.14-)**
|
||||
- ✅ 接受:与main直接相关的Bug修复:提交到main-fix分支
|
||||
- ⚠️ 冻结:所有新功能开发和非紧急重构
|
||||
|
||||
# 请填写以下内容
|
||||
(删除掉中括号内的空格,并替换为**小写的x**)
|
||||
1. - [ ] `main` 分支 **禁止修改**,请确认本次提交的分支 **不是 `main` 分支**
|
||||
2. - [ ] 本次更新 **包含破坏性变更**(如数据库结构变更、配置文件修改等)
|
||||
3. - [ ] 本次更新是否经过测试
|
||||
4. - [ ] 请**不要**在数据库中添加group_id字段,这会影响本项目对其他平台的兼容
|
||||
5. 请填写破坏性更新的具体内容(如有):
|
||||
6. 请简要说明本次更新的内容和目的:
|
||||
# 其他信息
|
||||
- **关联 Issue**:Close #
|
||||
- **截图/GIF**:
|
||||
- **附加信息**:
|
||||
29
.github/workflows/precheck.yml
vendored
Normal file
29
.github/workflows/precheck.yml
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
# .github/workflows/precheck.yml
|
||||
name: PR Precheck
|
||||
on: [pull_request]
|
||||
|
||||
jobs:
|
||||
conflict-check:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Check Conflicts
|
||||
run: |
|
||||
git fetch origin main
|
||||
if git diff --name-only --diff-filter=U origin/main...HEAD | grep .; then
|
||||
echo "CONFLICT=true" >> $GITHUB_ENV
|
||||
fi
|
||||
labeler:
|
||||
runs-on: ubuntu-latest
|
||||
needs: conflict-check
|
||||
steps:
|
||||
- uses: actions/github-script@v6
|
||||
if: env.CONFLICT == 'true'
|
||||
with:
|
||||
script: |
|
||||
github.rest.issues.addLabels({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
issue_number: context.issue.number,
|
||||
labels: ['🚫冲突需处理']
|
||||
})
|
||||
3
.github/workflows/ruff.yml
vendored
3
.github/workflows/ruff.yml
vendored
@@ -5,4 +5,5 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: astral-sh/ruff-action@v3
|
||||
- uses: astral-sh/ruff-action@v3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user