fix: rebase error

This commit is contained in:
DarkSky
2024-12-13 16:18:44 +08:00
parent e96f89c26b
commit 96a0650841
22 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ description: 'Run Copilot E2E Test'
inputs:
script:
description: 'Script to run'
default: 'yarn affine @affine-test/affine-cloud-copilot test:e2e --forbid-only'
default: 'yarn affine @affine-test/affine-cloud-copilot e2e --forbid-only'
required: false
openai-key:
description: 'OpenAI secret key'
+2 -2
View File
@@ -504,7 +504,7 @@ jobs:
filters: |
changed:
- 'packages/backend/server/src/plugins/copilot/**'
- 'packages/backend/server/tests/copilot.*'
- 'packages/backend/server/tests/copilot*'
- 'tests/affine-cloud-copilot/**'
- name: Setup Node.js
@@ -618,7 +618,7 @@ jobs:
if: ${{ steps.check-blocksuite-update.outputs.skip != 'true' || steps.e2efilter.outputs.changed == 'true' }}
uses: ./.github/actions/copilot-test
with:
script: yarn affine @affine-test/affine-cloud-copilot test:e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
script: yarn affine @affine-test/affine-cloud-copilot e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
openai-key: ${{ secrets.COPILOT_OPENAI_API_KEY }}
fal-key: ${{ secrets.COPILOT_FAL_API_KEY }}
perplexity-key: ${{ secrets.COPILOT_PERPLEXITY_API_KEY }}
+1 -1
View File
@@ -156,7 +156,7 @@ jobs:
- name: Run Copilot E2E Test ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
uses: ./.github/actions/copilot-test
with:
script: yarn affine @affine-test/affine-cloud-copilot test:e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
script: yarn affine @affine-test/affine-cloud-copilot e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
openai-key: ${{ secrets.COPILOT_OPENAI_API_KEY }}
fal-key: ${{ secrets.COPILOT_FAL_API_KEY }}
perplexity-key: ${{ secrets.COPILOT_PERPLEXITY_API_KEY }}
+2 -2
View File
@@ -12,10 +12,10 @@
"dev": "nodemon ./src/index.ts",
"dev:mail": "email dev -d src/mails",
"test": "ava --concurrency 1 --serial",
"test:copilot:e2e": "ava \"e2e/copilot.e2e.ts\"",
"test:copilot:e2e": "ava \"src/__tests__/**/copilot-*.e2e.ts\"",
"test:copilot:spec": "ava \"src/__tests__/**/copilot-*.spec.ts\"",
"test:coverage": "c8 ava --concurrency 1 --serial",
"test:copilot:e2e:coverage": "c8 ava --timeout=5m \"e2e/copilot.e2e.ts\"",
"test:copilot:e2e:coverage": "c8 ava --timeout=5m \"src/__tests__/**/copilot-*.e2e.ts\"",
"test:copilot:spec:coverage": "c8 ava --timeout=5m \"src/__tests__/**/copilot-*.spec.ts\"",
"data-migration": "cross-env NODE_ENV=script r ./src/data/index.ts",
"predeploy": "yarn prisma migrate deploy && NODE_ENV=script node --import ./scripts/register.js ./dist/data/index.js run",
@@ -3,7 +3,7 @@
"private": true,
"type": "module",
"scripts": {
"test:e2e": "yarn playwright test"
"e2e": "yarn playwright test"
},
"devDependencies": {
"@affine-test/kit": "workspace:*",

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

+4 -4
View File
@@ -19,18 +19,18 @@ __metadata:
languageName: node
linkType: hard
"@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud/copilot":
"@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud-copilot":
version: 0.0.0-use.local
resolution: "@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud/copilot"
resolution: "@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud-copilot"
dependencies:
"@affine-test/kit": "workspace:*"
"@playwright/test": "npm:=1.49.1"
languageName: unknown
linkType: soft
"@affine-test/affine-cloud@workspace:tests/affine-cloud/cloud":
"@affine-test/affine-cloud@workspace:tests/affine-cloud":
version: 0.0.0-use.local
resolution: "@affine-test/affine-cloud@workspace:tests/affine-cloud/cloud"
resolution: "@affine-test/affine-cloud@workspace:tests/affine-cloud"
dependencies:
"@affine-test/kit": "workspace:*"
"@playwright/test": "npm:=1.49.1"