Skip to content

Commit 50a2be8

Browse files
committed
Progress
1 parent 2959858 commit 50a2be8

File tree

4 files changed

+19
-13
lines changed

4 files changed

+19
-13
lines changed

.github/workflows/build-gui.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ jobs:
6363
with:
6464
submodules: recursive
6565

66-
- if: startsWith(matrix.os, 'ubuntu')
67-
name: Set up Linux dependencies
68-
uses: awalsh128/cache-apt-pkgs-action@v1.6.0
69-
with:
70-
packages: libgtk-3-dev libappindicator3-dev librsvg2-dev patchelf
71-
# Increment to invalidate the cache
72-
version: ${{ format('v1.1-{0}', env.BUILD_ARCH) }}
73-
# Enables a workaround to attempt to run pre and post install scripts
74-
execute_install_scripts: true
75-
# Disables uploading logs as a build artifact
76-
debug: false
66+
# - if: startsWith(matrix.os, 'ubuntu')
67+
# name: Set up Linux dependencies
68+
# uses: awalsh128/cache-apt-pkgs-action@v1.6.0
69+
# with:
70+
# packages: libgtk-3-dev libappindicator3-dev librsvg2-dev patchelf
71+
# # Increment to invalidate the cache
72+
# version: ${{ format('v2-{0}', env.BUILD_ARCH) }}
73+
# # Enables a workaround to attempt to run pre and post install scripts
74+
# execute_install_scripts: true
75+
# # Disables uploading logs as a build artifact
76+
# debug: false
7777

7878
- uses: pnpm/action-setup@v4
7979
- name: Use Node.js

gui/electron/main/utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export function handleIpc<K extends keyof IpcInvokeMap>(
2525
) => ReturnType<IpcInvokeMap[K]>
2626
) {
2727
ipcMain.handle(channel, (event, ...args) => {
28-
return handler(event, ...args);
28+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
29+
return handler(event, ...args as any);
2930
});
3031
}

gui/src/vite-env.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,8 @@ interface Window {
1414
}
1515

1616
declare module 'tailwind-gradient-mask-image';
17+
18+
declare module '*?asset' {
19+
const content: string;
20+
export default content;
21+
}

server/android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ java {
3434
val copyGuiAssets = tasks.register<Copy>("copyGuiAssets") {
3535
val target = layout.projectDirectory.dir("src/main/assets/web-gui")
3636
delete(target)
37-
from(rootProject.layout.projectDirectory.dir("gui/dist"))
37+
from(rootProject.layout.projectDirectory.dir("gui/out/renderer"))
3838
into(target)
3939
if (inputs.sourceFiles.isEmpty) {
4040
throw GradleException("You need to run \"pnpm run build\" on the gui folder first!")

0 commit comments

Comments
 (0)