GitFlow与Trunk-Based分支策略取舍及CI/CD自动化配置

main (Trunk)  ←—— feat/xxx (≤2天)  ←—— 直接合回
     │
     └── release/1.x.x (从main切出，只做bugfix，合回main)
     └── hotfix/xxx (从main切出，合回main和当前release)

# ~/.gitconfig 核心配置
[alias]
    co = switch
    br = branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative))'
    lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
    # 创建特性分支并推送远端
    new-feat = "!f() { git switch -c feat/$1 && git push -u origin feat/$1; }; f"
    # 合并main并清理本地分支
    sync-main = "!git fetch origin main && git rebase origin/main && git push --force-with-lease"

[core]
    # 避免文件权限变化导致误判冲突
    filemode = false
    # 解决中文文件名显示问题
    quotepath = false

[merge]
    # 默认使用rebase策略拉取远端更新，保持历史线性
    pull = rebase
    conflictstyle = zdiff3

#!/bin/sh
# .git/hooks/pre-push
# 校验commit message是否符合Conventional Commits规范
remote="$1"
url="$2"
# 获取将要推送的commit范围
z40=0000000000000000000000000000000000000000
while read local_ref local_sha remote_ref remote_sha
do
    if [ "$local_sha" = $z40 ]; then
        # 删除分支操作，跳过
        continue
    fi
    if [ "$remote_sha" = $z40 ]; then
        # 新分支，检查所有commit
        range="$local_sha"
    else
        range="$remote_sha..$local_sha"
    fi
    for commit in $(git rev-list "$range")
    do
        msg=$(git log -1 --pretty=%s "$commit")
        # 正则匹配: type(scope): subject
        if ! echo "$msg" | grep -qE '^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?: .{1,100}$'; then
            echo "❌ ERROR: commit message不符合规范: $msg"
            echo "   正确格式: feat(scope): 描述 或 fix: 描述"
            exit 1
        fi
    done
done
exit 0

## 变更描述
- **关联Issue**: Closes #(必填)
- **变更类型**: 🐛 Bug修复 / ✨ 新功能 / ♻️ 重构 / 📝 文档
- **影响范围**: 涉及的服务名、数据库变更、依赖升级

## 自测清单
- [ ] 本地已运行 `mvn verify` 通过(单测+集成测试)
- [ ] 已执行 `npm run lint` 无错误
- [ ] 已确认迁移脚本(如有)可回滚

## 测试说明
- 测试环境地址: http://staging.example.com
- 测试账号: 请在评论中索取

> ⚠️ 若变更超过400行，请注明原因并拆分MR

# .gitlab-ci.yml 核心片段 (基于GitLab 15.11)
stages:
  - test
  - sonar
  - build

variables:
  MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
  SONAR_TOKEN: $SONAR_TOKEN

cache:
  key: "$CI_COMMIT_REF_SLUG"
  paths:
    - .m2/repository
    - node_modules/

# 仅MR事件触发，避免重复构建
test:
  stage: test
  image: maven:3.8.7-eclipse-temurin-17
  script:
    - mvn test -B -DskipITs=false -DtrimStackTrace=false
  artifacts:
    when: always
    reports:
      junit:
        - target/surefire-reports/TEST-*.xml
  rules:
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'  # 核心：只跑MR
    - when: never

sonar:
  stage: sonar
  image: sonarsource/sonar-scanner-cli:5.0
  script:
    - sonar-scanner -Dsonar.qualitygate.wait=true -Dsonar.projectKey=$CI_PROJECT_KEY
  rules:
    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
    - when: never

# 构建镜像，仅在main分支合并后执行
build_image:
  stage: build
  image: docker:24.0.7
  services:
    - docker:24.0.7-dind
  script:
    - docker build -t registry.example.com/app:$CI_COMMIT_SHORT_SHA .
    - docker push registry.example.com/app:$CI_COMMIT_SHORT_SHA
  rules:
    - if: '$CI_COMMIT_BRANCH == "main"'

#!/bin/bash
# 同步release分支的修复到main
RELEASE_BRANCH=$1
if [ -z "$RELEASE_BRANCH" ]; then
    echo "用法: ./sync-release-fix.sh release/1.5.0"
    exit 1
fi
git switch main
git pull origin main
git merge --no-ff "$RELEASE_BRANCH" -m "chore: merge fix from $RELEASE_BRANCH to main"
git push origin main
echo "✅ 已同步 $RELEASE_BRANCH 到 main"

cache:
  key:
    files:
      - pom.xml  # 当pom.xml变更时自动失效缓存
  paths:
    - .m2/repository