Merge branch 'master' into daniellacosse/move_tools

Jigsaw-Code · Sep 29, 2023 · 6c37868 · 6c37868
2 parents a7992ab + efc1dbf
commit 6c37868
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/electron/electron-builder.json b/src/electron/electron-builder.json
@@ -8,7 +8,7 @@
   "linux": {
     "target": {
       "target": "AppImage",
-      "arch": ["x64", "arm64"]
+      "arch": ["x64"]
     },
     "files": ["build/icons/png", "third_party/outline-go-tun2socks/linux", "src/tools/outline_proxy_controller/dist"],
     "icon": "build/icons/png",

diff --git a/src/electron/start.action.mjs b/src/electron/start.action.mjs
@@ -16,7 +16,7 @@ import url from 'url';
 import electron from 'electron';
 
 import {runAction} from '../build/run_action.mjs';
-import {getElectronBuildParameters} from './get_electron_build_parameters.mjs';
+import {getBuildParameters} from '../build/get_build_parameters.mjs';
 import {getRootDir} from '../build/get_root_dir.mjs';
 import {spawnStream} from '../build/spawn_stream.mjs';
 
@@ -26,7 +26,7 @@ import {spawnStream} from '../build/spawn_stream.mjs';
  * @param {string[]} parameters
  */
 export async function main(...parameters) {
-  const {platform, buildMode} = getElectronBuildParameters(parameters);
+  const {platform, buildMode} = getBuildParameters(parameters);
 
   await runAction('www/build', platform, `--buildMode=${buildMode}`);
   await runAction('electron/build_main', ...parameters);