oh don't need that anymore lol

Jigsaw-Code · Apr 3, 2024 · 6b1a55a · 6b1a55a
1 parent 3f91b52
commit 6b1a55a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/client/src/cordova/test.action.mjs b/client/src/cordova/test.action.mjs
@@ -22,7 +22,7 @@ import rmfr from 'rmfr';
 import {getRootDir} from '../../../src/build/get_root_dir.mjs';
 import {spawnStream} from '../../../src/build/spawn_stream.mjs';
 
-const APPLE_ROOT = path.join(getRootDir(), 'src', 'cordova', 'apple');
+const APPLE_ROOT = path.join(getRootDir(), 'client', 'src', 'cordova', 'apple');
 const APPLE_LIBRARY_NAME = 'OutlineAppleLib';
 
 const SUPPORTED_PLATFORMS = new Set(['ios', 'macos', 'maccatalyst']);

diff --git a/client/src/tun2socks/build.action.mjs b/client/src/tun2socks/build.action.mjs
@@ -37,7 +37,7 @@ export async function main(...parameters) {
       'build',
       '-o',
       `output/build/${targetPlatform}/tun2socks${targetPlatform === 'windows' ? '.exe' : ''}`,
-      'github.com/Jigsaw-Code/outline-client/src/tun2socks/outline/electron'
+      'github.com/Jigsaw-Code/outline-apps/client/src/tun2socks/outline/electron'
     );
   }
 

diff --git a/src/build/run_action.mjs b/src/build/run_action.mjs
@@ -111,12 +111,7 @@ export async function runAction(actionPath, ...parameters) {
 }
 
 async function main() {
-  // TODO(daniellacosse): Hoist the build directory to the root of the project.
-  if (process.argv[2].startsWith('server_manager')) {
-    process.env.ROOT_DIR ??= path.resolve(getRootDir(), '..');
-  } else {
-    process.env.ROOT_DIR ??= getRootDir();
-  }
+  process.env.ROOT_DIR ??= getRootDir();
   process.env.OUTPUT_DIR ??= path.join(process.env.ROOT_DIR, 'output');
   process.env.BUILD_DIR ??= path.join(process.env.OUTPUT_DIR, 'build');
   process.env.COVERAGE_DIR ??= path.join(process.env.OUTPUT_DIR, 'coverage');