fix: ci (#13)

toeverything · Nov 27, 2023 · fabbe6a · fabbe6a
1 parent d8675eb
commit fabbe6a
Show file tree

Hide file tree

Showing 13 changed files with 140 additions and 46 deletions.
diff --git a/.github/workflows/daily-build.yaml b/.github/workflows/daily-build.yaml
@@ -26,52 +26,32 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
-      - name: Build esbuild
+      - name: Build and Test esbuild
         run: |
           cd packages/esbuild
           pnpm run build
-          pnpm serve
-      - name: Run esbuild tests
-        run: |
-          cd packages/esbuild
           pnpm test
 
-      - name: Build next
+      - name: Build and Test next
         run: |
           cd packages/next
           pnpm run build
-          pnpm start
-      - name: Run next tests
-        run: |
-          cd packages/next
           pnpm test
 
-      - name: Build nuxt
+      - name: Build and Test nuxt
         run: |
           cd packages/nuxt
           pnpm run build
-          pnpm preview
-      - name: Run nuxt tests
-        run: |
-          cd packages/nuxt
           pnpm test
 
-      - name: Build rspack
+      - name: Build and Test rspack
         run: |
           cd packages/rspack
           pnpm run build
-          pnpm serve
-      - name: Run rspack tests
-        run: |
-          cd packages/rspack
           pnpm test
 
-      - name: Build webpack
+      - name: Build and Test webpack
         run: |
           cd packages/webpack
           pnpm run build
-          pnpm serve
-      - name: Run webpack tests
-        run: |
-          cd packages/webpack
           pnpm test
diff --git a/package.json b/package.json
@@ -9,9 +9,9 @@
   "dependencies": {
     "@blocksuite/blocks": "nightly",
     "@blocksuite/editor": "nightly",
-    "@blocksuite/global": "^0.9.0",
+    "@blocksuite/global": "nightly",
     "@blocksuite/store": "nightly",
-    "@blocksuite/virgo": "^0.9.0"
+    "@blocksuite/virgo": "nightly"
   },
   "devDependencies": {
     "@playwright/test": "^1.40.0",

diff --git a/packages/esbuild/playwright.config.ts b/packages/esbuild/playwright.config.ts
@@ -5,6 +5,16 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: 'tests',
   fullyParallel: true,
+  webServer: {
+    command: 'pnpm serve',
+    port: 3000,
+    // command: process.env.CI ? 'pnpm preview' : 'pnpm dev',
+    // port: process.env.CI ? 4173 : 5173,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      COVERAGE: process.env.COVERAGE ?? '',
+    },
+  },
   use: {
     browserName:
       (process.env.BROWSER as PlaywrightWorkerOptions['browserName']) ??

diff --git a/packages/esbuild/tests/basic.spec.ts b/packages/esbuild/tests/basic.spec.ts
@@ -8,8 +8,7 @@ import {
 } from '../../../tests/utils/keyboard';
 import { assertText, assertEmpty } from '../../../tests/utils/asserts';
 
-const PORT = 3000;
-const TEST_URL = `http://localhost:${PORT}`;
+const TEST_URL = `http://localhost:3000`;
 
 test.describe('webpack build test', () => {
   test('basic input & undo/redo', async ({ page }) => {

diff --git a/packages/next/playwright.config.ts b/packages/next/playwright.config.ts
@@ -5,6 +5,16 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: 'tests',
   fullyParallel: true,
+  webServer: {
+    command: 'pnpm start',
+    port: 3001,
+    // command: process.env.CI ? 'pnpm preview' : 'pnpm dev',
+    // port: process.env.CI ? 4173 : 5173,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      COVERAGE: process.env.COVERAGE ?? '',
+    },
+  },
   use: {
     browserName:
       (process.env.BROWSER as PlaywrightWorkerOptions['browserName']) ??

diff --git a/packages/next/tests/basic.spec.ts b/packages/next/tests/basic.spec.ts
@@ -8,8 +8,7 @@ import {
 } from '../../../tests/utils/keyboard';
 import { assertText, assertEmpty } from '../../../tests/utils/asserts';
 
-const PORT = 3002;
-const TEST_URL = `http://localhost:${PORT}`;
+const TEST_URL = `http://localhost:3001`;
 
 test.describe('webpack build test', () => {
   test('basic input & undo/redo', async ({ page }) => {

diff --git a/packages/nuxt/playwright.config.ts b/packages/nuxt/playwright.config.ts
@@ -5,6 +5,16 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: 'tests',
   fullyParallel: true,
+  webServer: {
+    command: 'pnpm preview',
+    port: 3002,
+    // command: process.env.CI ? 'pnpm preview' : 'pnpm dev',
+    // port: process.env.CI ? 4173 : 5173,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      COVERAGE: process.env.COVERAGE ?? '',
+    },
+  },
   use: {
     browserName:
       (process.env.BROWSER as PlaywrightWorkerOptions['browserName']) ??

diff --git a/packages/nuxt/tests/basic.spec.ts b/packages/nuxt/tests/basic.spec.ts
@@ -8,8 +8,7 @@ import {
 } from '../../../tests/utils/keyboard';
 import { assertText, assertEmpty } from '../../../tests/utils/asserts';
 
-const PORT = 3002;
-const TEST_URL = `http://localhost:${PORT}`;
+const TEST_URL = `http://localhost:3002`;
 
 test.describe('webpack build test', () => {
   test('basic input & undo/redo', async ({ page }) => {

diff --git a/packages/rspack/playwright.config.ts b/packages/rspack/playwright.config.ts
@@ -5,6 +5,16 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: 'tests',
   fullyParallel: true,
+  webServer: {
+    command: 'pnpm serve',
+    port: 3003,
+    // command: process.env.CI ? 'pnpm preview' : 'pnpm dev',
+    // port: process.env.CI ? 4173 : 5173,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      COVERAGE: process.env.COVERAGE ?? '',
+    },
+  },
   use: {
     browserName:
       (process.env.BROWSER as PlaywrightWorkerOptions['browserName']) ??

diff --git a/packages/rspack/tests/basic.spec.ts b/packages/rspack/tests/basic.spec.ts
@@ -8,8 +8,7 @@ import {
 } from '../../../tests/utils/keyboard';
 import { assertText, assertEmpty } from '../../../tests/utils/asserts';
 
-const PORT = 3003;
-const TEST_URL = `http://localhost:${PORT}`;
+const TEST_URL = `http://localhost:3003`;
 
 test.describe('webpack build test', () => {
   test('basic input & undo/redo', async ({ page }) => {

diff --git a/packages/webpack/playwright.config.ts b/packages/webpack/playwright.config.ts
@@ -5,6 +5,16 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: 'tests',
   fullyParallel: true,
+  webServer: {
+    command: 'pnpm serve',
+    port: 3004,
+    // command: process.env.CI ? 'pnpm preview' : 'pnpm dev',
+    // port: process.env.CI ? 4173 : 5173,
+    reuseExistingServer: !process.env.CI,
+    env: {
+      COVERAGE: process.env.COVERAGE ?? '',
+    },
+  },
   use: {
     browserName:
       (process.env.BROWSER as PlaywrightWorkerOptions['browserName']) ??

diff --git a/packages/webpack/tests/basic.spec.ts b/packages/webpack/tests/basic.spec.ts
@@ -8,8 +8,7 @@ import {
 } from '../../../tests/utils/keyboard';
 import { assertText, assertEmpty } from '../../../tests/utils/asserts';
 
-const PORT = 3004;
-const TEST_URL = `http://localhost:${PORT}`;
+const TEST_URL = `http://localhost:3004`;
 
 test.describe('webpack build test', () => {
   test('basic input & undo/redo', async ({ page }) => {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml