Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix regression of kit environment variables #3991

Merged
merged 3 commits into from
Aug 16, 2024
Merged

fix regression of kit environment variables #3991

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9762bb4
fix regression of kit environment variables
gcampbell-msft Aug 15, 2024
a4e9fe8
Merge branch 'main' into dev/gcampbell/FixKitEnvironmentVariables
gcampbell-msft Aug 16, 2024
7eda8db
Merge branch 'main' into dev/gcampbell/FixKitEnvironmentVariables
gcampbell-msft Aug 16, 2024
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
7 changes: 3 additions & 4 deletions src/kit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,12 +1029,11 @@ export async function effectiveKitEnvironment(kit: Kit, opts?: expand.ExpansionO
}
} else {
const vs_vars = await getVSKitEnvironment(kit);
const penv = EnvironmentUtils.merge([env, vs_vars]);
env = EnvironmentUtils.merge([penv, kit_env]);
const expandOptions: expand.ExpansionOptions = opts ? {...opts, envOverride: env, penvOverride: penv } : {
env = EnvironmentUtils.merge([env, vs_vars]);
const expandOptions: expand.ExpansionOptions = opts ? {...opts, envOverride: env, penvOverride: env } : {
vars: {} as expand.KitContextVars,
envOverride: env,
penvOverride: penv
penvOverride: env
};
for (const env_var of Object.keys(kit_env)) {
env[env_var] = await expand.expandString(kit_env[env_var], expandOptions);
Expand Down
Loading