From 919cfd89ebf44d37b55cea14ff080475863c4087 Mon Sep 17 00:00:00 2001
From: Vladimir Stoilov <vladimir@safing.io>
Date: Tue, 16 Jul 2024 12:31:52 +0300
Subject: [PATCH] Fix CI, tauri, angular, go-test
---
Earthfile | 6 +++---
assets/icons_windows.go | 8 ++++----
desktop/angular/src/app/integration/taur-app.ts | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Earthfile b/Earthfile
index 6014f748..46a1226b 100644
--- a/Earthfile
+++ b/Earthfile
@@ -16,10 +16,10 @@ ARG --global outputDir = "./dist"
# to GOOS, GOARCH and GOARM when building go binaries. See the +RUST_TO_GO_ARCH_STRING
# helper method at the bottom of the file.
-ARG --global architectures = "x86_64-unknown-linux-gnu" \
- "aarch64-unknown-linux-gnu" \
- "x86_64-pc-windows-gnu"
+ARG --global architectures = "x86_64-unknown-linux-gnu"
# TODO: Compile errors here:
+ # "x86_64-pc-windows-gnu" --> Will work only on windows machine
+ # "aarch64-unknown-linux-gnu" --> Needs new docker container with arm libraries installed
# "aarch64-pc-windows-gnu" \
# "x86_64-apple-darwin" \
# "aarch64-apple-darwin"
diff --git a/assets/icons_windows.go b/assets/icons_windows.go
index 83f5db2e..a8472c56 100644
--- a/assets/icons_windows.go
+++ b/assets/icons_windows.go
@@ -14,16 +14,16 @@ const (
// Icons.
var (
- //go:embed data/icons/pm_light_green_512.ico
+ //go:embed data/icons/pm_light_green_256.png
GreenICO []byte
- //go:embed data/icons/pm_light_yellow_512.ico
+ //go:embed data/icons/pm_light_yellow_256.png
YellowICO []byte
- //go:embed data/icons/pm_light_red_512.ico
+ //go:embed data/icons/pm_light_red_256.png
RedICO []byte
- //go:embed data/icons/pm_light_blue_512.ico
+ //go:embed data/icons/pm_light_blue_256.png
BlueICO []byte
// ColoredIcons holds all the icons as .ICOs
diff --git a/desktop/angular/src/app/integration/taur-app.ts b/desktop/angular/src/app/integration/taur-app.ts
index c9ea0828..0e1d9e59 100644
--- a/desktop/angular/src/app/integration/taur-app.ts
+++ b/desktop/angular/src/app/integration/taur-app.ts
@@ -28,7 +28,7 @@ function asyncInvoke<T>(method: string, args: object): Promise<T> {
if (typeof event.payload === 'object' && 'error' in event.payload) {
reject(event.payload);
return
- };
+ }
resolve(event.payload);
})
@@ -130,7 +130,7 @@ export class TauriIntegrationService implements IntegrationService {
}
}
- get_state(key: string): Promise<string> {
+ get_state(_: string): Promise<string> {
return invoke<string>("get_state");
}
@@ -150,7 +150,7 @@ export class TauriIntegrationService implements IntegrationService {
}
onExitRequest(cb: () => void): () => void {
- let unlisten: () => void = () => { };
+ let unlisten: () => void = () => undefined;
listen('exit-requested', () => {
cb();
@@ -189,7 +189,7 @@ export class TauriIntegrationService implements IntegrationService {
return;
}
- let promptWindow = new Window("prompt", {
+ const promptWindow = new Window("prompt", {
alwaysOnTop: true,
decorations: false,
minimizable: false,