Skip to content

Commit df82fd8

Browse files
committed
Merge remote-tracking branch 'origin/dev' into fix/vscode-language-id
2 parents 247dc61 + e013774 commit df82fd8

File tree

7 files changed

+15
-20
lines changed

7 files changed

+15
-20
lines changed

.github/workflows/publish-release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
push:
66
branches:
77
- main
8+
env:
9+
TELEMETRY_TRACKING_TOKEN: ${{ secrets.TELEMETRY_TRACKING_TOKEN }}
10+
DO_NOT_TRACK: '1'
811

912
permissions:
1013
contents: write

.vscode/settings.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
{
2-
"vitest.workspaceConfig": "./vitest.workspace.ts"
3-
}
1+
{}

packages/cli/test/init.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import tmp from 'tmp';
44
import { describe, expect, it } from 'vitest';
55
import { runCli } from './utils';
66

7-
describe('Cli init command tests', () => {
7+
// skipping due to timeout during CI
8+
describe.skip('Cli init command tests', () => {
89
it('should create a new project', () => {
910
const { name: workDir } = tmp.dirSync({ unsafeCleanup: true });
1011
runCli('init', workDir);

packages/cli/test/migrate.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ model User {
99
}
1010
`;
1111

12-
describe('CLI migrate commands test', () => {
12+
// skip due to timeout in CI
13+
describe.skip('CLI migrate commands test', () => {
1314
it('should generate a database with migrate dev', () => {
1415
const workDir = createProject(model);
1516
runCli('migrate dev --name init', workDir);

vitest.base.config.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

vitest.config.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { defineConfig } from 'vitest/config';
2+
3+
export default defineConfig({
4+
test: {
5+
projects: ['packages/*'],
6+
},
7+
});

vitest.workspace.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)