Skip to content

Commit

Permalink
Merge branch 'dev' into feat/linked-vp
Browse files Browse the repository at this point in the history
  • Loading branch information
nanderstabel committed Sep 5, 2024
2 parents 7b50623 + 87b4e45 commit ddf1e78
Show file tree
Hide file tree
Showing 157 changed files with 8,632 additions and 11,104 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/format-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,27 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v4
with:
version: latest

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: 'pnpm'

- name: Install NPM dependencies in project root and workspaces
run: npm ci
run: pnpm i --frozen-lockfile

- name: Format
run: npm run format:check
run: pnpm format:check

- name: Lint
run: npm run lint
run: pnpm lint

- name: Test
run: npm run test
run: pnpm test

unime_core:
runs-on: ubuntu-latest
Expand All @@ -54,14 +59,19 @@ jobs:
working-directory: ./unime/src-tauri
run: cargo fmt -- --check

- uses: pnpm/action-setup@v4
with:
version: latest

- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 'lts/*'
cache: 'pnpm'

- name: Build frontend
# Otherwise linting will fail with error: The `distDir` configuration is set to `"../build"` but this path doesn't exist.
run: npm ci && npm run build
run: pnpm i --frozen-lockfile && pnpm build
env:
PUBLIC_DEV_MODE_MENU_EXPANDED: false

Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"rust-lang.rust-analyzer",
"svelte.svelte-vscode"
"svelte.svelte-vscode",
"vitest.explorer"
]
}
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,14 @@
},
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer"
},

"search.exclude": {
"pnpm-lock.yaml": true
},

"terminal.integrated.env.linux": {
"GTK_PATH": null,
"GIO_MODULE_DIR": null
}
}
Loading

0 comments on commit ddf1e78

Please sign in to comment.