From 5c8237d5c6403315f88f80c3a158ccde58e4c1dd Mon Sep 17 00:00:00 2001 From: Manus CI Date: Fri, 21 Aug 2026 10:31:45 +0000 Subject: [PATCH] =?UTF-8?q?CI=20:=20workflow=20validate.yml,=20manifeste?= =?UTF-8?q?=20ci.required:true,=20garde=20VITEST,=20tests=20isol=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/validate.yml | 45 ++++++++++++++++++++++++++++++++++ app.json | 5 +++- package.json | 5 ++-- server/_core/index.ts | 5 +++- server/db.ts | 2 ++ server/llmFieldsConfig.test.ts | 4 ++- 6 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 .gitea/workflows/validate.yml diff --git a/.gitea/workflows/validate.yml b/.gitea/workflows/validate.yml new file mode 100644 index 0000000..7023c2b --- /dev/null +++ b/.gitea/workflows/validate.yml @@ -0,0 +1,45 @@ +name: Validation applicative + +on: + push: + branches: [main, master] + paths-ignore: + - "**.md" + - "docs/**" + pull_request: + branches: [main, master] + paths-ignore: + - "**.md" + - "docs/**" + workflow_dispatch: + +jobs: + verify: + name: TypeScript, tests et build + # Label dédié : image locale avec Node 22, pnpm verrouillé et Bash déjà installés. + runs-on: ci-node22 + timeout-minutes: 15 + steps: + - name: Récupérer les sources + uses: actions/checkout@v4 + + - name: Calculer la clé de cache pnpm + id: pnpm-cache-key + shell: bash + run: | + echo "store=$(pnpm store path --silent)" >> "$GITHUB_OUTPUT" + echo "lock=$(sha256sum pnpm-lock.yaml | cut -d ' ' -f 1)" >> "$GITHUB_OUTPUT" + + - name: Restaurer le store pnpm + uses: actions/cache@v4 + with: + path: ${{ steps.pnpm-cache-key.outputs.store }} + key: pnpm-${{ runner.os }}-${{ steps.pnpm-cache-key.outputs.lock }} + restore-keys: | + pnpm-${{ runner.os }}- + + - name: Installer les dépendances verrouillées + run: pnpm install --frozen-lockfile --prefer-offline + + - name: Vérifier TypeScript, tests et build + run: pnpm verify diff --git a/app.json b/app.json index f9d753d..c528ebf 100644 --- a/app.json +++ b/app.json @@ -9,5 +9,8 @@ "containerName": "demat-facturation-app", "image": "images/demat-facturation-dsi.jpg", "giteaRepo": "demat-facturation", - "giteaOwner": "manus-admin" + "giteaOwner": "manus-admin", + "ci": { + "required": true + } } diff --git a/package.json b/package.json index bcb1bf0..f69de18 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,8 @@ "check": "tsc --noEmit", "format": "prettier --write .", "test": "vitest run", - "db:push": "drizzle-kit generate && drizzle-kit migrate" + "db:push": "drizzle-kit generate && drizzle-kit migrate", + "verify": "pnpm check && pnpm test && pnpm build" }, "dependencies": { "@aws-sdk/client-s3": "^3.693.0", @@ -137,4 +138,4 @@ "sharp" ] } -} \ No newline at end of file +} diff --git a/server/_core/index.ts b/server/_core/index.ts index 4c2ccc6..f0605ce 100644 --- a/server/_core/index.ts +++ b/server/_core/index.ts @@ -406,4 +406,7 @@ async function startServer() { }, 5000); // Attendre 5s que le serveur soit prêt } -startServer().catch(console.error); +// Vitest ne doit jamais démarrer un serveur HTTP. +if (!process.env.VITEST) { + startServer().catch(console.error); +} diff --git a/server/db.ts b/server/db.ts index f869495..dcb8aa5 100644 --- a/server/db.ts +++ b/server/db.ts @@ -1224,6 +1224,8 @@ export async function updateWebImportSourceStatus( * Used to prevent duplicate file storage during email import */ export async function findSourceFileByFileName(userId: number, fileName: string): Promise { + const db = await getDb(); + if (!db) return null; const result = await db.select() .from(sourceFiles) .where(and( diff --git a/server/llmFieldsConfig.test.ts b/server/llmFieldsConfig.test.ts index d5c9c58..15be5e1 100644 --- a/server/llmFieldsConfig.test.ts +++ b/server/llmFieldsConfig.test.ts @@ -1,11 +1,13 @@ import { describe, it, expect, beforeAll } from "vitest"; + +const describeIntegration = process.env.DATABASE_URL ? describe : describe.skip; import { getLlmFieldsConfigByUser, upsertLlmFieldConfig, initializeDefaultLlmFields } from "./db"; -describe("LLM Fields Configuration", () => { +describeIntegration("LLM Fields Configuration", () => { const testUserId = 99999; // Use a high ID to avoid conflicts beforeAll(async () => {