You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
126 lines
3.7 KiB
JavaScript
126 lines
3.7 KiB
JavaScript
#!/usr/bin/env node
|
|
|
|
const { execSync } = require('child_process');
|
|
|
|
const COLORS = {
|
|
red: '\x1b[31m',
|
|
green: '\x1b[32m',
|
|
yellow: '\x1b[33m',
|
|
cyan: '\x1b[36m',
|
|
reset: '\x1b[0m'
|
|
};
|
|
|
|
function log(message, color = 'reset') {
|
|
console.log(`${COLORS[color]}${message}${COLORS.reset}`);
|
|
}
|
|
|
|
function exec(command, options = {}) {
|
|
try {
|
|
return execSync(command, { encoding: 'utf-8', stdio: options.silent ? 'pipe' : 'inherit', ...options });
|
|
} catch (error) {
|
|
if (options.ignoreError) {
|
|
return error.stdout || '';
|
|
}
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
function run() {
|
|
log('\n========================================', 'cyan');
|
|
log(' 合并 master 到 production 分支', 'cyan');
|
|
log('========================================\n', 'cyan');
|
|
|
|
// 获取当前分支名
|
|
const currentBranch = exec('git branch --show-current', { silent: true }).trim();
|
|
log(`当前分支: ${currentBranch}\n`, 'cyan');
|
|
|
|
// 暂存未提交的更改
|
|
const status = exec('git status --porcelain', { silent: true });
|
|
const hasChanges = status.trim().length > 0;
|
|
if (hasChanges) {
|
|
log('>>> 暂存未提交的更改...', 'yellow');
|
|
exec('git stash push -m "暂存未提交的更改"');
|
|
log('已暂存\n', 'green');
|
|
}
|
|
|
|
// 拉取最新代码
|
|
log('>>> 拉取远程最新代码...', 'yellow');
|
|
try {
|
|
exec('git fetch origin');
|
|
} catch (error) {
|
|
log('\n错误: 拉取远程代码失败', 'red');
|
|
process.exit(1);
|
|
}
|
|
log('拉取完成\n', 'green');
|
|
|
|
// 切换到 master 并更新
|
|
log('>>> 切换到 master 分支并更新...', 'yellow');
|
|
try {
|
|
exec('git checkout master');
|
|
exec('git pull origin master');
|
|
} catch (error) {
|
|
log('\n错误: 更新 master 分支失败', 'red');
|
|
process.exit(1);
|
|
}
|
|
log('master 分支已更新\n', 'green');
|
|
|
|
// 切换到 production 并更新
|
|
log('>>> 切换到 production 分支并更新...', 'yellow');
|
|
try {
|
|
exec('git checkout production');
|
|
exec('git pull origin production');
|
|
} catch (error) {
|
|
log('\n错误: 更新 production 分支失败，分支可能不存在', 'red');
|
|
log('请先创建 production 分支: git checkout -b production\n', 'yellow');
|
|
exec(`git checkout ${currentBranch}`, { ignoreError: true });
|
|
process.exit(1);
|
|
}
|
|
log('production 分支已更新\n', 'green');
|
|
|
|
// 合并 master 到 production
|
|
log('>>> 合并 master 到 production...', 'yellow');
|
|
try {
|
|
exec('git merge master --no-edit');
|
|
} catch (error) {
|
|
log('\n错误: 合并过程中发生冲突!', 'red');
|
|
log('请手动解决冲突后再提交', 'red');
|
|
log('\n冲突文件:', 'yellow');
|
|
exec('git diff --name-only --diff-filter=U', { ignoreError: true });
|
|
log('\n解决冲突后运行:', 'yellow');
|
|
log(' git add .', 'cyan');
|
|
log(' git commit', 'cyan');
|
|
log(' git push origin production\n', 'cyan');
|
|
log('或放弃合并:', 'yellow');
|
|
log(' git merge --abort\n', 'cyan');
|
|
process.exit(1);
|
|
}
|
|
log('合并成功\n', 'green');
|
|
|
|
// 推送到远程
|
|
log('>>> 推送到远程 production 分支...', 'yellow');
|
|
try {
|
|
exec('git push origin production');
|
|
} catch (error) {
|
|
log('\n错误: 推送失败', 'red');
|
|
process.exit(1);
|
|
}
|
|
log('推送成功\n', 'green');
|
|
|
|
// 切换回原分支
|
|
log(`>>> 切换回原分支 ${currentBranch}...`, 'yellow');
|
|
exec(`git checkout ${currentBranch}`, { ignoreError: true });
|
|
|
|
// 恢复暂存的更改
|
|
if (hasChanges) {
|
|
log('>>> 恢复暂存的更改...', 'yellow');
|
|
exec('git stash pop', { ignoreError: true });
|
|
log('已恢复\n', 'green');
|
|
}
|
|
|
|
log('\n========================================', 'green');
|
|
log(' master 已成功合并到 production!', 'green');
|
|
log('========================================\n', 'green');
|
|
}
|
|
|
|
run();
|