mirror of
https://github.com/iflytek/skillhub.git
synced 2026-08-27 11:14:59 +00:00
f8d96171f0
- Rename setup-agent-worktrees.sh -> parallel-init.sh - Rename sync-agent-integration.sh -> parallel-sync.sh - Rename 13-agent-parallel-workflow.md -> 13-parallel-workflow.md - Add parallel-common.sh with shared utilities - Add parallel-up.sh (sync + dev-all in one step) - Add parallel-down.sh (stop integration stack) - Remove agent-worktrees and agent-sync Makefile targets - Remove AGENT_BASE_REF and AGENT_WORKTREE_ROOT variables - Clean up compatibility shim references in docs
274 lines
10 KiB
Makefile
274 lines
10 KiB
Makefile
.PHONY: help dev dev-all dev-down dev-all-down dev-all-reset dev-logs dev-status build test clean web-install dev-server dev-web build-web test-web typecheck-web lint-web generate-api db-reset validate-release-config staging staging-down staging-logs pr parallel-init parallel-sync parallel-up parallel-down
|
||
|
||
DEV_DIR := .dev
|
||
DEV_SERVER_PID := $(DEV_DIR)/server.pid
|
||
DEV_WEB_PID := $(DEV_DIR)/web.pid
|
||
DEV_SERVER_LOG := $(DEV_DIR)/server.log
|
||
DEV_WEB_LOG := $(DEV_DIR)/web.log
|
||
DEV_WEB_URL := http://localhost:3000
|
||
DEV_API_URL := http://localhost:8080
|
||
STAGING_API_URL := http://localhost:8080
|
||
STAGING_WEB_URL := http://localhost
|
||
STAGING_SERVER_IMAGE := skillhub-server:staging
|
||
DEV_PROCESS := python3 scripts/dev_process.py
|
||
PARALLEL_BASE_REF ?= origin/main
|
||
PARALLEL_WORKTREE_ROOT ?=
|
||
DEV_COMPOSE_PROJECT_NAME ?= skillhub
|
||
STAGING_COMPOSE_PROJECT_NAME ?= skillhub-staging
|
||
DEV_COMPOSE := docker compose -p $(DEV_COMPOSE_PROJECT_NAME)
|
||
STAGING_BASE_COMPOSE := docker compose -p $(STAGING_COMPOSE_PROJECT_NAME)
|
||
STAGING_COMPOSE := $(STAGING_BASE_COMPOSE) -f docker-compose.yml -f docker-compose.staging.yml
|
||
|
||
help: ## 显示帮助
|
||
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | \
|
||
awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'
|
||
|
||
dev: ## 启动本地开发环境（仅依赖服务）
|
||
$(DEV_COMPOSE) up -d --wait --remove-orphans
|
||
@echo "Services ready."
|
||
@echo "Start backend with: make dev-server"
|
||
@echo "Start frontend with: make dev-web"
|
||
|
||
dev-all: ## 一键启动本地开发环境（依赖 + 后端 + 前端）
|
||
@mkdir -p $(DEV_DIR)
|
||
@$(MAKE) dev
|
||
@if [ ! -d web/node_modules ]; then \
|
||
echo "Installing frontend dependencies..."; \
|
||
$(MAKE) web-install; \
|
||
fi
|
||
@if $(DEV_PROCESS) status --pid-file $(DEV_SERVER_PID) >/dev/null 2>&1; then \
|
||
echo "Backend already running with PID $$(cat $(DEV_SERVER_PID))"; \
|
||
else \
|
||
echo "Starting backend..."; \
|
||
$(DEV_PROCESS) start --pid-file $(DEV_SERVER_PID) --log-file $(DEV_SERVER_LOG) --cwd server -- /bin/sh -lc './mvnw -pl skillhub-app -am install -DskipTests >/dev/null && exec ./mvnw -pl skillhub-app spring-boot:run -Dspring-boot.run.profiles=local' >/dev/null; \
|
||
fi
|
||
@if $(DEV_PROCESS) status --pid-file $(DEV_WEB_PID) >/dev/null 2>&1; then \
|
||
echo "Frontend already running with PID $$(cat $(DEV_WEB_PID))"; \
|
||
else \
|
||
echo "Starting frontend..."; \
|
||
$(DEV_PROCESS) start --pid-file $(DEV_WEB_PID) --log-file $(DEV_WEB_LOG) --cwd web -- pnpm exec vite --host 0.0.0.0 --strictPort >/dev/null; \
|
||
fi
|
||
@echo "Waiting for backend on $(DEV_API_URL) ..."
|
||
@backend_ready=0; \
|
||
for attempt in 1 2; do \
|
||
for i in $$(seq 1 30); do \
|
||
if curl -sf $(DEV_API_URL)/actuator/health >/dev/null; then \
|
||
echo "Backend ready."; \
|
||
backend_ready=1; \
|
||
break 2; \
|
||
fi; \
|
||
if ! $(DEV_PROCESS) status --pid-file $(DEV_SERVER_PID) >/dev/null 2>&1; then \
|
||
break; \
|
||
fi; \
|
||
sleep 2; \
|
||
done; \
|
||
if [ "$$attempt" -lt 2 ]; then \
|
||
echo "Backend did not become ready on attempt $$attempt. Restarting..."; \
|
||
$(DEV_PROCESS) stop --pid-file $(DEV_SERVER_PID); \
|
||
sleep 2; \
|
||
$(DEV_PROCESS) start --pid-file $(DEV_SERVER_PID) --log-file $(DEV_SERVER_LOG) --cwd server -- /bin/sh -lc './mvnw -pl skillhub-app -am install -DskipTests >/dev/null && exec ./mvnw -pl skillhub-app spring-boot:run -Dspring-boot.run.profiles=local' >/dev/null; \
|
||
fi; \
|
||
done; \
|
||
if [ "$$backend_ready" -ne 1 ]; then \
|
||
echo "Backend failed to become ready. Check $(DEV_SERVER_LOG)"; \
|
||
exit 1; \
|
||
fi
|
||
@echo "Waiting for frontend on $(DEV_WEB_URL) ..."
|
||
@frontend_ready=0; \
|
||
for i in $$(seq 1 60); do \
|
||
if curl -sf $(DEV_WEB_URL) >/dev/null; then \
|
||
echo "Frontend ready."; \
|
||
frontend_ready=1; \
|
||
break; \
|
||
fi; \
|
||
sleep 2; \
|
||
done; \
|
||
if [ "$$frontend_ready" -ne 1 ]; then \
|
||
echo "Frontend failed to become ready. Check $(DEV_WEB_LOG)"; \
|
||
exit 1; \
|
||
fi
|
||
@echo "Local environment is ready:"
|
||
@echo " Web UI: $(DEV_WEB_URL)"
|
||
@echo " Backend: $(DEV_API_URL)"
|
||
@echo "Mock auth users:"
|
||
@echo " local-user -> X-Mock-User-Id: local-user"
|
||
@echo " local-admin -> X-Mock-User-Id: local-admin"
|
||
@echo "Logs:"
|
||
@echo " Backend: $(DEV_SERVER_LOG)"
|
||
@echo " Frontend: $(DEV_WEB_LOG)"
|
||
|
||
dev-server: ## 启动后端开发服务器
|
||
cd server && /bin/sh -lc './mvnw -pl skillhub-app -am install -DskipTests >/dev/null && exec ./mvnw -pl skillhub-app spring-boot:run -Dspring-boot.run.profiles=local'
|
||
|
||
dev-down: ## 停止本地开发环境
|
||
$(DEV_COMPOSE) down --remove-orphans
|
||
|
||
dev-all-down: ## 停止本地开发环境（依赖 + 后端 + 前端）
|
||
@$(DEV_PROCESS) stop --pid-file $(DEV_SERVER_PID)
|
||
@$(DEV_PROCESS) stop --pid-file $(DEV_WEB_PID)
|
||
@$(MAKE) dev-down
|
||
|
||
dev-all-reset: ## 重置本地开发环境（清理依赖数据卷后重新启动）
|
||
@$(DEV_PROCESS) stop --pid-file $(DEV_SERVER_PID)
|
||
@$(DEV_PROCESS) stop --pid-file $(DEV_WEB_PID)
|
||
$(DEV_COMPOSE) down -v --remove-orphans
|
||
rm -rf $(DEV_DIR)
|
||
@$(MAKE) dev-all
|
||
|
||
dev-status: ## 查看本地开发服务状态
|
||
@echo "=== Dependency Services ==="
|
||
@$(DEV_COMPOSE) ps
|
||
@echo ""
|
||
@echo "=== Backend ==="
|
||
@if $(DEV_PROCESS) status --pid-file $(DEV_SERVER_PID) >/dev/null 2>&1; then \
|
||
echo " Running (PID $$(cat $(DEV_SERVER_PID)))"; \
|
||
else \
|
||
echo " Not running"; \
|
||
fi
|
||
@echo "=== Frontend ==="
|
||
@if $(DEV_PROCESS) status --pid-file $(DEV_WEB_PID) >/dev/null 2>&1; then \
|
||
echo " Running (PID $$(cat $(DEV_WEB_PID)))"; \
|
||
else \
|
||
echo " Not running"; \
|
||
fi
|
||
|
||
dev-logs: ## 实时查看开发服务日志（backend/frontend，默认 backend）
|
||
@SERVICE=$${SERVICE:-backend}; \
|
||
if [ "$$SERVICE" = "backend" ]; then \
|
||
tail -f $(DEV_SERVER_LOG); \
|
||
elif [ "$$SERVICE" = "frontend" ]; then \
|
||
tail -f $(DEV_WEB_LOG); \
|
||
else \
|
||
echo "Unknown service: $$SERVICE. Use SERVICE=backend or SERVICE=frontend"; \
|
||
exit 1; \
|
||
fi
|
||
|
||
build: ## 构建后端
|
||
cd server && ./mvnw clean package -DskipTests
|
||
|
||
test: ## 运行后端测试
|
||
cd server && ./mvnw test
|
||
|
||
clean: ## 清理构建产物
|
||
cd server && ./mvnw clean
|
||
$(DEV_COMPOSE) down -v
|
||
rm -rf $(DEV_DIR)
|
||
|
||
generate-api: ## 生成 OpenAPI 类型（前端用）
|
||
@echo "Generating OpenAPI types..."
|
||
cd web && pnpm run generate-api
|
||
|
||
web-install: ## 安装前端依赖
|
||
cd web && pnpm install
|
||
|
||
dev-web: ## 启动前端开发服务器
|
||
cd web && pnpm run dev
|
||
|
||
build-web: ## 构建前端
|
||
cd web && pnpm run build
|
||
|
||
test-web: ## 运行前端测试
|
||
cd web && pnpm run test
|
||
|
||
typecheck-web: ## 前端类型检查
|
||
cd web && pnpm run typecheck
|
||
|
||
lint-web: ## 前端代码检查
|
||
cd web && pnpm run lint
|
||
|
||
db-reset: ## 重置数据库
|
||
$(DEV_COMPOSE) down -v --remove-orphans
|
||
$(DEV_COMPOSE) up -d --wait --remove-orphans postgres
|
||
cd server && ./mvnw flyway:migrate -pl skillhub-app
|
||
|
||
validate-release-config: ## 校验发布环境变量文件（默认 .env.release）
|
||
./scripts/validate-release-config.sh .env.release
|
||
|
||
staging: ## 构建并启动 staging 环境，运行 smoke test（混合模式：后端镜像 + 前端静态文件）
|
||
@echo "=== [1/5] Building backend JAR and Docker image ==="
|
||
cd server && ./mvnw package -DskipTests -B -q
|
||
docker build -t $(STAGING_SERVER_IMAGE) -f server/Dockerfile.dev server
|
||
@echo "=== [2/5] Building frontend static files ==="
|
||
cd web && pnpm run build
|
||
@echo "=== [3/5] Starting dependency services ==="
|
||
$(STAGING_BASE_COMPOSE) up -d --wait
|
||
@echo "=== [4/5] Starting staging services ==="
|
||
$(STAGING_COMPOSE) up -d --wait server web
|
||
@echo "=== [5/5] Running smoke tests ==="
|
||
@if bash scripts/smoke-test.sh $(STAGING_API_URL); then \
|
||
echo ""; \
|
||
echo "Staging passed. Environment is running:"; \
|
||
echo " Web UI: $(STAGING_WEB_URL)"; \
|
||
echo " Backend: $(STAGING_API_URL)"; \
|
||
echo ""; \
|
||
echo "Run 'make staging-down' to stop."; \
|
||
echo "Run 'make pr' to create a pull request."; \
|
||
else \
|
||
echo ""; \
|
||
echo "Smoke tests FAILED. Printing logs..."; \
|
||
$(STAGING_COMPOSE) logs server; \
|
||
$(MAKE) staging-down; \
|
||
exit 1; \
|
||
fi
|
||
|
||
staging-down: ## 停止 staging 环境
|
||
$(STAGING_COMPOSE) down --remove-orphans
|
||
|
||
staging-logs: ## 查看 staging 服务日志（SERVICE=server|web，默认 server）
|
||
@SERVICE=$${SERVICE:-server}; \
|
||
$(STAGING_COMPOSE) logs -f $$SERVICE
|
||
|
||
pr: ## 推送当前分支并创建 Pull Request（需要 gh CLI，仅限交互式终端）
|
||
@if ! command -v gh >/dev/null 2>&1; then \
|
||
echo "Error: gh CLI not found. Install from https://cli.github.com/"; \
|
||
exit 1; \
|
||
fi
|
||
@if ! gh auth status >/dev/null 2>&1; then \
|
||
echo "Error: gh CLI not authenticated. Run: gh auth login"; \
|
||
exit 1; \
|
||
fi
|
||
@BRANCH=$$(git rev-parse --abbrev-ref HEAD); \
|
||
if [ "$$BRANCH" = "main" ] || [ "$$BRANCH" = "master" ]; then \
|
||
echo "Error: Cannot create PR from main/master branch."; \
|
||
exit 1; \
|
||
fi
|
||
@if ! git diff --quiet || ! git diff --cached --quiet; then \
|
||
echo "You have uncommitted changes:"; \
|
||
git status --short; \
|
||
echo ""; \
|
||
printf "Commit all changes before creating PR? [y/N] "; \
|
||
read -r answer; \
|
||
if [ "$$answer" = "y" ] || [ "$$answer" = "Y" ]; then \
|
||
git add -A; \
|
||
git commit -m "chore: pre-PR commit"; \
|
||
else \
|
||
echo "Aborted. Commit or stash your changes first."; \
|
||
exit 1; \
|
||
fi; \
|
||
fi
|
||
@BRANCH=$$(git rev-parse --abbrev-ref HEAD); \
|
||
echo "Pushing branch $$BRANCH to origin..."; \
|
||
git push -u origin "$$BRANCH"
|
||
@echo "Creating pull request..."
|
||
@if gh pr view >/dev/null 2>&1; then \
|
||
echo "A pull request already exists for this branch:"; \
|
||
gh pr view --json url -q '.url'; \
|
||
exit 0; \
|
||
fi
|
||
@gh pr create --fill --web || gh pr create --fill
|
||
|
||
parallel-init: ## 创建 Claude/Codex/integration 并行 worktree（TASK=<slug>）
|
||
@if [ -z "$(TASK)" ]; then \
|
||
echo "Usage: make parallel-init TASK=<task-slug> [PARALLEL_BASE_REF=origin/main] [PARALLEL_WORKTREE_ROOT=/path]"; \
|
||
exit 1; \
|
||
fi
|
||
./scripts/parallel-init.sh "$(TASK)" "$(PARALLEL_BASE_REF)" "$(PARALLEL_WORKTREE_ROOT)"
|
||
|
||
parallel-sync: ## 在 integration worktree 合并 Claude/Codex 分支（自动识别当前 task）
|
||
PARALLEL_WORKTREE_ROOT="$(PARALLEL_WORKTREE_ROOT)" ./scripts/parallel-sync.sh $(SOURCES)
|
||
|
||
parallel-up: ## 在 integration worktree 合并并启动联调环境（自动识别当前 task）
|
||
PARALLEL_WORKTREE_ROOT="$(PARALLEL_WORKTREE_ROOT)" ./scripts/parallel-up.sh $(SOURCES)
|
||
|
||
parallel-down: ## 在 integration worktree 停止联调环境
|
||
./scripts/parallel-down.sh
|