Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

.github/workflows/build_desktop_linux.yaml

@@ -160,11 +160,11 @@ jobs:
               if: steps.cache.outputs.cache-hit != 'true'
               run: |
                   docker run \
-                    -v ${{ github.workspace }}/apps/desktop:/work -w /work \
+                    -v ${{ github.workspace }}:/work -w /work \
                     -e SQLCIPHER_BUNDLED \
                     -e CI=1 \
                     $HAK_DOCKER_IMAGE \
-                    pnpm run build:native
+                    pnpm -C apps/desktop run build:native
 
             - name: Fix permissions
               working-directory: apps/desktop

.github/workflows/dockerbuild.yaml

@@ -35,6 +35,7 @@ jobs:
               uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
               with:
                   file: apps/desktop/dockerbuild/Dockerfile
+                  context: apps/desktop
                   push: false
                   load: true
                   tags: element-desktop-dockerbuild
@@ -66,6 +67,7 @@ jobs:
               uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
               with:
                   file: apps/desktop/dockerbuild/Dockerfile
+                  context: apps/desktop
                   push: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}

apps/desktop/package.json

@@ -30,7 +30,7 @@
         "asar-webapp": "asar p webapp webapp.asar",
         "start": "pnpm run build:ts && pnpm run build:res && electron .",
         "lint": "pnpm lint:types && pnpm lint:js",
-        "lint:js": "eslint --max-warnings 0 src hak playwright scripts && prettier --check .",
+        "lint:js": "eslint --max-warnings 0 src hak playwright scripts",
         "lint:js-fix": "eslint --fix --max-warnings 0 src hak playwright scripts && prettier --log-level=warn --write .",
         "lint:types": "pnpm lint:types:src && pnpm lint:types:test && pnpm lint:types:scripts && pnpm lint:types:hak",
         "lint:types:src": "tsc --noEmit",

apps/desktop/scripts/hak/hakEnv.ts

@@ -14,7 +14,7 @@ import childProcess, { type SpawnOptions } from "node:child_process";
 import { type Arch, type Target, TARGETS, getHost, isHostId, type TargetId } from "./target.js";
 
 async function getRuntimeVersion(projectRoot: string): Promise<string> {
-    const electronVersion = await getElectronVersionFromInstalled(projectRoot);
+    const electronVersion = await getElectronVersionFromInstalled(path.join(projectRoot, "..", ".."));
     if (!electronVersion) {
         throw new Error("Can't determine Electron version");
     }

apps/desktop/src/electron-main.ts

@@ -70,7 +70,7 @@ if (argv["help"]) {
     console.log("  --no-update:          Disable automatic updating.");
     console.log("  --hidden:             Start the application hidden in the system tray.");
     console.log("  --help:               Displays this help message.");
-    console.log("And more such as --proxy, see:" + "https://electronjs.org/docs/api/command-line-switches");
+    console.log("And more such as --proxy, see: https://electronjs.org/docs/api/command-line-switches");
     app.exit();
 }