chore: 精简 CI 流水线 — 移除测试环节，仅保留 build → deploy
移除: 单元测试、current-integration、backward-compat 三个 Job 保留: build (npm ci + prisma + build) → deploy (迁移 + rsync + systemctl) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
wangdl
parent
67cab56a26
commit
a8ac081490
@ -4,11 +4,6 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
|
||||||
force_backward_compat:
|
|
||||||
description: 'Force M-AI-01 backward compatibility test'
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
||||||
@ -17,21 +12,18 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
# Job 1: Build + Unit Tests
|
# Job 1: Build
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
build-and-unit:
|
build:
|
||||||
runs-on: prod
|
runs-on: prod
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
run: |
|
run: |
|
||||||
if [ -d $WORKDIR ]; then
|
if [ -d $WORKDIR ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
# Save previous HEAD before reset — used by backward-compat for change detection
|
|
||||||
git rev-parse HEAD > /tmp/prev-head 2>/dev/null || true
|
|
||||||
git fetch origin && git reset --hard origin/main
|
git fetch origin && git reset --hard origin/main
|
||||||
else
|
else
|
||||||
git clone http://10.2.0.7:3000/wangdl/api-server.git $WORKDIR
|
git clone http://10.2.0.7:3000/wangdl/api-server.git $WORKDIR
|
||||||
git rev-parse HEAD > /tmp/prev-head 2>/dev/null || true
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
@ -47,9 +39,6 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: cd $WORKDIR && npm run build
|
run: cd $WORKDIR && npm run build
|
||||||
|
|
||||||
- name: Unit tests
|
|
||||||
run: cd $WORKDIR && npx jest --passWithNoTests
|
|
||||||
|
|
||||||
- name: Save build artifacts
|
- name: Save build artifacts
|
||||||
run: |
|
run: |
|
||||||
rm -rf $ARTIFACT_DIR
|
rm -rf $ARTIFACT_DIR
|
||||||
@ -61,241 +50,10 @@ jobs:
|
|||||||
cp $WORKDIR/package-lock.json $ARTIFACT_DIR/package-lock.json
|
cp $WORKDIR/package-lock.json $ARTIFACT_DIR/package-lock.json
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
# Job 2: Current-version Integration Tests
|
# Job 2: Deploy
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
current-integration:
|
|
||||||
needs: build-and-unit
|
|
||||||
runs-on: prod
|
|
||||||
steps:
|
|
||||||
- name: Restore build artifacts
|
|
||||||
run: |
|
|
||||||
cp -a $ARTIFACT_DIR/dist $WORKDIR/dist
|
|
||||||
cp -a $ARTIFACT_DIR/node_modules $WORKDIR/node_modules
|
|
||||||
cp -a $ARTIFACT_DIR/prisma $WORKDIR/prisma
|
|
||||||
|
|
||||||
- name: Ensure infrastructure
|
|
||||||
run: |
|
|
||||||
docker start mysql redis qdrant 2>/dev/null || true
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
- name: Apply database migrations
|
|
||||||
run: |
|
|
||||||
cd $WORKDIR
|
|
||||||
HAS_MIGS=$(npx prisma db execute --stdin <<< "SELECT COUNT(*) as cnt FROM _prisma_migrations" 2>/dev/null | grep -o '[0-9]*' | head -1 || echo "0")
|
|
||||||
if [ "$HAS_MIGS" = "0" ] || [ -z "$HAS_MIGS" ]; then
|
|
||||||
echo "[deploy] Baselining existing migrations..."
|
|
||||||
for m in prisma/migrations/*/; do
|
|
||||||
m_name=$(basename "$m")
|
|
||||||
if [ "$m_name" != "backfill_chat_scope.sql" ] && [ "$m_name" != "migration_lock.toml" ]; then
|
|
||||||
DATABASE_URL="${{ secrets.DATABASE_URL }}" npx prisma migrate resolve --applied "$m_name" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo "[deploy] Baseline complete."
|
|
||||||
fi
|
|
||||||
DATABASE_URL="${{ secrets.DATABASE_URL }}" npx prisma migrate deploy
|
|
||||||
env:
|
|
||||||
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
|
||||||
timeout-minutes: 5
|
|
||||||
|
|
||||||
- name: Check if Worker paths changed
|
|
||||||
run: |
|
|
||||||
cd $WORKDIR
|
|
||||||
PREV=$(cat /tmp/prev-head 2>/dev/null || echo "")
|
|
||||||
if [ -n "$PREV" ]; then
|
|
||||||
CHANGED=$(git diff --name-only $PREV..HEAD 2>/dev/null || echo "")
|
|
||||||
else
|
|
||||||
CHANGED=$(git diff --name-only HEAD~1..HEAD 2>/dev/null || echo "")
|
|
||||||
fi
|
|
||||||
echo "Changed files: $CHANGED"
|
|
||||||
if echo "$CHANGED" | grep -qE "src/workers/|src/modules/ai-analysis/|src/modules/ai/|src/modules/ai-job/|src/modules/active-recall/|src/modules/review/|src/modules/focus-items/|src/infrastructure/queue/|src/infrastructure/outbox/|prisma/schema.prisma|prisma/migrations/|test/worker-integration|test/run-integration|test/m-ai-04|test/m-ai-05|test/m-ai-06|test/m-ai-07|test/m-ai-08"; then
|
|
||||||
echo "Worker-related changes detected — running integration tests"
|
|
||||||
echo "run_int=true" > /tmp/int-decision
|
|
||||||
else
|
|
||||||
echo "No Worker-related changes — skipping integration tests"
|
|
||||||
echo "run_int=false" > /tmp/int-decision
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Worker Integration tests
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/int-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" != "true" ]; then
|
|
||||||
echo "[integration] Skipped — no Worker-related changes"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
cd $WORKDIR
|
|
||||||
bash test/run-integration-tests.sh
|
|
||||||
env:
|
|
||||||
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
|
||||||
REDIS_HOST: 127.0.0.1
|
|
||||||
REDIS_PORT: '6379'
|
|
||||||
REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
|
|
||||||
JWT_SECRET: test-integration-secret
|
|
||||||
INTERNAL_API_KEY: test-key
|
|
||||||
CREDENTIAL_ENCRYPTION_KEY: ${{ secrets.CREDENTIAL_ENCRYPTION_KEY }}
|
|
||||||
STORAGE_DRIVER: local
|
|
||||||
MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }}
|
|
||||||
timeout-minutes: 10
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# Job 3: M-AI-01 Backward Compatibility
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
backward-compat:
|
|
||||||
needs: build-and-unit
|
|
||||||
runs-on: prod
|
|
||||||
steps:
|
|
||||||
- name: Check if DB-related paths changed
|
|
||||||
id: paths
|
|
||||||
run: |
|
|
||||||
cd $WORKDIR
|
|
||||||
FORCE="${{ inputs.force_backward_compat || 'false' }}"
|
|
||||||
if [ "$FORCE" = "true" ]; then
|
|
||||||
echo "[backward-compat] Forced by workflow_dispatch input"
|
|
||||||
echo "run_compat=true" > /tmp/compat-decision
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
# Diff HEAD against previous HEAD saved by build-and-unit checkout step.
|
|
||||||
# This catches exactly what changed in this push.
|
|
||||||
PREV=$(cat /tmp/prev-head 2>/dev/null || echo "")
|
|
||||||
if [ -n "$PREV" ] && [ "$PREV" != "$(git rev-parse HEAD)" ]; then
|
|
||||||
CHANGED=$(git diff --name-only $PREV..HEAD 2>/dev/null || echo "")
|
|
||||||
else
|
|
||||||
# Fallback: check last 3 commits
|
|
||||||
CHANGED=""
|
|
||||||
for n in 1 2 3; do
|
|
||||||
CHANGED="$CHANGED $(git diff --name-only HEAD~$n..HEAD 2>/dev/null || echo "")"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
echo "Previous HEAD: ${PREV:-none}"
|
|
||||||
echo "Changed files: $CHANGED"
|
|
||||||
if echo "$CHANGED" | grep -qE "prisma/schema.prisma|prisma/migrations/|src/modules/ai-analysis/|src/workers/ai-analysis.worker.ts|src/infrastructure/queue/|src/infrastructure/outbox/|src/modules/ai-runtime/ai-job|.gitea/workflows/"; then
|
|
||||||
echo "DB-related changes detected — running backward compatibility"
|
|
||||||
echo "run_compat=true" > /tmp/compat-decision
|
|
||||||
else
|
|
||||||
echo "No DB-related changes — skipping backward compatibility"
|
|
||||||
echo "run_compat=false" > /tmp/compat-decision
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Ensure infrastructure
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/compat-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" = "true" ]; then
|
|
||||||
docker start mysql redis 2>/dev/null || true
|
|
||||||
sleep 2
|
|
||||||
else
|
|
||||||
echo "[backward-compat] Skipped — no DB changes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Checkout M-AI-01 baseline
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/compat-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" != "true" ]; then exit 0; fi
|
|
||||||
OLD_DIR=/tmp/api-server-old
|
|
||||||
mkdir -p $OLD_DIR
|
|
||||||
cd $OLD_DIR
|
|
||||||
if [ -d .git ]; then
|
|
||||||
git fetch origin && git checkout 789d6ec --force
|
|
||||||
else
|
|
||||||
git clone http://10.2.0.7:3000/wangdl/api-server.git .
|
|
||||||
git checkout 789d6ec
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Install M-AI-01 dependencies
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/compat-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" != "true" ]; then exit 0; fi
|
|
||||||
cd /tmp/api-server-old && npm ci
|
|
||||||
timeout-minutes: 5
|
|
||||||
|
|
||||||
- name: Generate M-AI-01 Prisma client
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/compat-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" != "true" ]; then exit 0; fi
|
|
||||||
cd /tmp/api-server-old && npx prisma generate
|
|
||||||
|
|
||||||
- name: Run backward compatibility tests
|
|
||||||
if: success()
|
|
||||||
run: |
|
|
||||||
RUN=$(cat /tmp/compat-decision 2>/dev/null | grep -o 'true\|false' || echo "false")
|
|
||||||
if [ "$RUN" != "true" ]; then
|
|
||||||
echo "[backward-compat] Skipped — no DB-related changes"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
# Write test inside old code dir so tsx can find node_modules/@prisma/client
|
|
||||||
cat > /tmp/api-server-old/compat-test.ts << 'TESTEOF'
|
|
||||||
import { PrismaClient } from '@prisma/client';
|
|
||||||
const DB_URL = process.env.DATABASE_URL || '';
|
|
||||||
const prisma = new PrismaClient({ datasources: { db: { url: DB_URL } } });
|
|
||||||
async function main() {
|
|
||||||
const TEST_USER = 'backward-compat-test-' + Date.now();
|
|
||||||
let errors = 0;
|
|
||||||
await prisma.$executeRawUnsafe("INSERT IGNORE INTO User (id, email, createdAt, updatedAt) VALUES (?, ?, NOW(), NOW())", TEST_USER, TEST_USER + '@test.com');
|
|
||||||
console.log('1. User created: ' + TEST_USER);
|
|
||||||
let job: any;
|
|
||||||
try {
|
|
||||||
job = await (prisma as any).aiAnalysisJob.create({ data: { userId: TEST_USER, jobType: 'feynman-evaluation', status: 'pending', sessionId: null, answerId: null, queuedAt: new Date() } });
|
|
||||||
console.log('2. createJob: id=' + job.id + ' status=' + job.status + ' ✅');
|
|
||||||
} catch (e: any) { console.log('2. createJob FAILED: ' + e.message + ' ❌'); errors++; await prisma.$disconnect(); process.exit(1); }
|
|
||||||
try {
|
|
||||||
const found = await (prisma as any).aiAnalysisJob.findUnique({ where: { id: job.id }, include: { results: true } });
|
|
||||||
if (!found) throw new Error('not found');
|
|
||||||
console.log('3. findById: id=' + found.id + ' status=' + found.status + ' ✅');
|
|
||||||
} catch (e: any) { console.log('3. findById FAILED: ' + e.message + ' ❌'); errors++; }
|
|
||||||
try {
|
|
||||||
const updated = await (prisma as any).aiAnalysisJob.update({ where: { id: job.id }, data: { status: 'processing', startedAt: new Date() } });
|
|
||||||
console.log('4. pending→processing: status=' + updated.status + ' ✅');
|
|
||||||
} catch (e: any) { console.log('4. pending→processing FAILED: ' + e.message + ' ❌'); errors++; }
|
|
||||||
try {
|
|
||||||
const updated = await (prisma as any).aiAnalysisJob.update({ where: { id: job.id }, data: { status: 'completed', completedAt: new Date() } });
|
|
||||||
console.log('5. processing→completed: status=' + updated.status + ' ✅');
|
|
||||||
} catch (e: any) { console.log('5. processing→completed FAILED: ' + e.message + ' ❌'); errors++; }
|
|
||||||
let job2: any;
|
|
||||||
try {
|
|
||||||
job2 = await (prisma as any).aiAnalysisJob.create({ data: { userId: TEST_USER, jobType: 'active-recall', status: 'pending', queuedAt: new Date() } });
|
|
||||||
await (prisma as any).aiAnalysisJob.update({ where: { id: job2.id }, data: { status: 'processing', startedAt: new Date() } });
|
|
||||||
const failed = await (prisma as any).aiAnalysisJob.update({ where: { id: job2.id }, data: { status: 'failed', errorMessage: 'test error', completedAt: new Date() } });
|
|
||||||
console.log('6. processing→failed: status=' + failed.status + ' errorMessage=' + failed.errorMessage + ' ✅');
|
|
||||||
} catch (e: any) { console.log('6. processing→failed FAILED: ' + e.message + ' ❌'); errors++; }
|
|
||||||
const cols = await prisma.$queryRawUnsafe("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'AiAnalysisJob' AND COLUMN_NAME IN ('errorMessage','completedAt','status','jobType') ORDER BY ORDINAL_POSITION") as any[];
|
|
||||||
const colNames = cols.map((c: any) => c.COLUMN_NAME);
|
|
||||||
const required = ['jobType','status','errorMessage','completedAt'];
|
|
||||||
const missing = required.filter(r => !colNames.includes(r));
|
|
||||||
if (missing.length === 0) { console.log('7. Physical columns preserved: ' + colNames.join(', ') + ' ✅'); }
|
|
||||||
else { console.log('7. MISSING: ' + missing.join(', ') + ' ❌'); errors++; }
|
|
||||||
try {
|
|
||||||
await (prisma as any).aiAnalysisResult.create({ data: { userId: TEST_USER, jobId: job.id, summary: 'test', masteryScore: 80 } });
|
|
||||||
const results = await (prisma as any).aiAnalysisResult.findMany({ where: { jobId: job.id } });
|
|
||||||
console.log('8. AiAnalysisResult FK: ' + results.length + ' results ✅');
|
|
||||||
} catch (e: any) { console.log('8. AiAnalysisResult FK FAILED: ' + e.message + ' ❌'); errors++; }
|
|
||||||
try {
|
|
||||||
await (prisma as any).aiUsageLog.create({ data: { userId: TEST_USER, feature: 'compat-test', provider: 'deepseek', model: 'deepseek-chat', tier: 'primary', promptKey: 'test', promptVersion: 'v1' } });
|
|
||||||
console.log('9. AiUsageLog insert ✅');
|
|
||||||
} catch (e: any) { console.log('9. AiUsageLog insert: ' + e.message + ' ⚠️ (non-blocking, table may need migration)'); }
|
|
||||||
await prisma.$executeRawUnsafe("DELETE FROM AiAnalysisResult WHERE userId = ?", TEST_USER);
|
|
||||||
try { await (prisma as any).aiUsageLog.deleteMany({ where: { userId: TEST_USER } }); } catch {}
|
|
||||||
await (prisma as any).aiAnalysisJob.deleteMany({ where: { userId: TEST_USER } });
|
|
||||||
await prisma.$executeRawUnsafe("DELETE FROM User WHERE id = ?", TEST_USER);
|
|
||||||
await prisma.$disconnect();
|
|
||||||
if (errors > 0) { console.log('\n' + errors + ' core test(s) FAILED ❌'); process.exit(1); }
|
|
||||||
console.log('\nAll backward compatibility tests PASSED ✅');
|
|
||||||
}
|
|
||||||
main().catch(e => { console.error(e); process.exit(1); });
|
|
||||||
TESTEOF
|
|
||||||
cd /tmp/api-server-old
|
|
||||||
DATABASE_URL="${{ secrets.DATABASE_URL }}" npx tsx compat-test.ts
|
|
||||||
env:
|
|
||||||
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
|
||||||
timeout-minutes: 5
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
|
||||||
# Job 4: Deploy (only if all gates pass)
|
|
||||||
# ═══════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════
|
||||||
deploy:
|
deploy:
|
||||||
needs: [current-integration, backward-compat]
|
needs: build
|
||||||
runs-on: prod
|
runs-on: prod
|
||||||
steps:
|
steps:
|
||||||
- name: Restore build artifacts
|
- name: Restore build artifacts
|
||||||
@ -368,8 +126,3 @@ jobs:
|
|||||||
sleep 5
|
sleep 5
|
||||||
echo "[deploy] Worker: $(sudo systemctl is-active zhixi-nest-worker)"
|
echo "[deploy] Worker: $(sudo systemctl is-active zhixi-nest-worker)"
|
||||||
sudo journalctl -u zhixi-nest-worker --no-pager -n 10
|
sudo journalctl -u zhixi-nest-worker --no-pager -n 10
|
||||||
|
|
||||||
- name: Trigger RAG Worker deploy
|
|
||||||
run: |
|
|
||||||
echo "[deploy] RAG Worker is now deployed from its own CI/CD pipeline"
|
|
||||||
echo "[deploy] Repo: http://10.2.0.7:3000/wangdl/rag-worker"
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user