Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/utils/siso.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ const sisoEnv = (config) => {
return sisoEnv;
};

function getStarFile(envVar, filename) {
if (process.env[envVar] && fs.existsSync(process.env[envVar])) {
return process.env[envVar];
}
return path.resolve(__dirname, '../../tools', filename);
}

function sisoFlags(config, hasExecute) {
if (config.remoteBuild !== 'siso') return [];

Expand All @@ -34,7 +41,7 @@ function sisoFlags(config, hasExecute) {
'-reapi_address',
reclient.serviceAddress(config),
'-load',
path.resolve(__dirname, '../../tools/main.star'),
getStarFile('ELECTRON_BUILD_TOOLS_MAIN_STAR', 'main.star'),
];

if (!hasExecute) {
Expand All @@ -54,7 +61,7 @@ async function ensureBackendStarlark(config) {
);
}

const backendConfig = path.resolve(__dirname, '../../tools/backend.star');
const backendConfig = getStarFile('ELECTRON_BUILD_TOOLS_BACKEND_STAR', 'backend.star');
const starlarkPath = path.resolve(starlarkDir, 'backend.star');
let needsUpdate = true;
if (fs.existsSync(starlarkPath)) {
Expand Down