GitFlow与TrunkBased混合策略：支撑百人团队每日百次合并的版本控制方案

pipeline {
    agent any
    environment {
        // 假设是一个Java项目
        MAVEN_OPTS = '-Xmx2048m'
    }
    stages {
        stage('Branch Type Detection') {
            steps {
                script {
                    // 获取分支名，如: feature/PROJ-123-add-login, release/2.4.0
                    def branchName = env.BRANCH_NAME
                    if (branchName.startsWith('release/')) {
                        env.BRANCH_TYPE = 'RELEASE'
                    } else if (branchName == 'master') {
                        env.BRANCH_TYPE = 'MASTER'
                    } else {
                        env.BRANCH_TYPE = 'FEATURE'
                    }
                }
            }
        }
        stage('Build & Unit Test') {
            steps {
                sh 'mvn clean package -DskipTests=false'
            }
        }
        stage('SonarQube Analysis') {
            when { branch 'master' } // 只有master执行全量分析
            steps {
                withSonarQubeEnv('SonarQube') {
                    sh 'mvn sonar:sonar -Dsonar.projectKey=my-service'
                }
            }
        }
        stage('Integration Test') {
            when { environment name: 'BRANCH_TYPE', value: 'RELEASE' }
            steps {
                // 模拟生产环境的测试套件
                sh 'mvn verify -Pit-test'
            }
        }
        stage('Publish Artifact') {
            when { branch 'master' }
            steps {
                // 推送Docker镜像到私有仓库
                sh 'docker build -t my-registry/my-service:${BUILD_NUMBER} .'
                sh 'docker push my-registry/my-service:${BUILD_NUMBER}'
            }
        }
    }
    post {
        failure {
            // 通知到企业微信机器人
            sh "curl -X POST 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=xxx' -H 'Content-Type: application/json' -d '{\"msgtype\":\"text\",\"text\":{\"content\":\"Pipeline Failed: ${env.JOB_NAME} - ${env.BUILD_URL}\"}}'"
        }
    }
}

#!/bin/bash

# 获取将要推送的分支名
branch=$(git rev-parse --abbrev-ref HEAD)

# 规则1: 禁止直接向master推送 (必须走MR)
if [ "$branch" = "master" ]; then
    echo "❌ 错误: 禁止直接推送master，请创建MR并获取Approval"
    exit 1
fi

# 规则2: 特性分支命名校验 (必须包含工单号)
if [[ "$branch" =~ ^(feature|fix|refactor)/[A-Z]+-[0-9]+-.*$ ]]; then
    echo "✅ 分支命名规范"
else
    echo "❌ 错误: 分支命名不规范。正确格式: feature/PROJ-123-short-description"
    exit 1
fi

# 规则3: 检查是否存在WIP (Work In Progress) 提交
# 防止误推送
wip_count=$(git log origin/$branch..HEAD --oneline --grep="WIP" | wc -l)
if [ "$wip_count" -gt 0 ]; then
    echo "❌ 错误: 发现 $wip_count 个WIP提交，请先squash或者reword"
    exit 1
fi

echo "✅ 本地检查通过，推送请求已发往远端"
exit 0

# 必须由非作者批准
gitlab_rails['gitlab_default_features'] = true
gitlab_rails['gitlab_default_projects_features_merge_requests_author_approval'] = false
# 强制至少2个批准
gitlab_rails['gitlab_default_projects_features_merge_requests_approval_rules'] = {
  'default_approval_rules' => [
    {
      'name' => 'Default',
      'approvals_required' => 2,
      'rule_type' => 'regular'
    }
  ]
}