Skip to content

Commit e084f22

Browse files
committed
fix(cli): gate synced parent env vars on branch in worker build path
1 parent d196561 commit e084f22

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

  • packages/cli-v3/src/commands/workers

packages/cli-v3/src/commands/workers/build.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,18 @@ async function _workerBuildCommand(dir: string, options: WorkersBuildCommandOpti
264264
const secretChildVars = buildManifest.deploy.sync?.secretEnv ?? {};
265265
const secretParentVars = buildManifest.deploy.sync?.secretParentEnv ?? {};
266266

267-
const numberOfEnvVars =
268-
Object.keys(childVars).length +
269-
Object.keys(parentVars).length +
270-
Object.keys(secretChildVars).length +
271-
Object.keys(secretParentVars).length;
272-
273-
if (buildManifest.deploy.sync && numberOfEnvVars > 0) {
267+
const hasVarsToSync =
268+
Object.keys(childVars).length > 0 ||
269+
Object.keys(secretChildVars).length > 0 ||
270+
// Only sync parent variables if this is a branch environment
271+
(branch && (Object.keys(parentVars).length > 0 || Object.keys(secretParentVars).length > 0));
272+
273+
if (hasVarsToSync) {
274+
const numberOfEnvVars =
275+
Object.keys(childVars).length +
276+
Object.keys(parentVars).length +
277+
Object.keys(secretChildVars).length +
278+
Object.keys(secretParentVars).length;
274279
const vars = numberOfEnvVars === 1 ? "var" : "vars";
275280

276281
if (!options.skipSyncEnvVars) {

0 commit comments

Comments
 (0)