fix: ci service config (#3)

toeverything · May 21, 2024 · 1a76758 · 1a76758
1 parent e212520
commit 1a76758
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -28,5 +28,25 @@ jobs:
       - name: Install playwright browsers
         run: npx playwright install chromium
 
+      - name: Build common package
+        run: pnpm --filter @notesuite/common build
+
+      - name: Start server
+        run: |
+          pnpm dev:server > server.log 2>&1 &
+          SERVER_PID=$!
+          pnpm dev:web > web.log 2>&1 &
+          WEB_PID=$!
+      - name: Wait for services
+        run: sleep 2
+
       - name: Run E2E test
         run: pnpm test
+
+      - name: Display server log
+        if: failure()
+        run: cat server.log
+
+      - name: Display web log
+        if: failure()
+        run: cat web.log
diff --git a/packages/server/register.js b/packages/server/register.js
@@ -1,4 +1,4 @@
 import { register } from 'node:module';
 import { pathToFileURL } from 'node:url';
 
-register('ts-node/esm', pathToFileURL('./'));
+register('ts-node/esm', pathToFileURL('./'));
diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -3,7 +3,6 @@ import { initWebDAVServer } from './drive/drive.js';
 import { initAppContext, initWSServer } from './utils.js';
 
 const context = await initAppContext();
-
 registerAPI(context);
 initWSServer(context);
 initWebDAVServer(context);
diff --git a/tests/common/agent.ts b/tests/common/agent.ts
@@ -81,6 +81,8 @@ export class TestAgent {
 
   async start(options: StartOptions) {
     this.options = options;
+    if (process.env.CI) return;
+
     await this.runner.clean();
     await Promise.all([
       this.runner.startServer(options.backendPort, options.name),
@@ -89,6 +91,7 @@ export class TestAgent {
   }
 
   async stop() {
+    if (process.env.CI) return;
     await this.runner.stop();
   }
 

diff --git a/tests/common/runner.js b/tests/common/runner.js
@@ -101,8 +101,6 @@ export class AppRunner {
   }
 
   async stop() {
-    if (process.env.CI) return;
-
     await Promise.all([
       this._terminateProcess(this.serverProcess, 'server'),
       this._terminateProcess(this.webProcess, 'web'),

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,5 +10,10 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "moduleResolution": "NodeNext"
+  },
+  "ts-node": {
+    "experimentalSpecifierResolution": "node",
+    "transpileOnly": true,
+    "esm": true
   }
 }