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
19 changes: 8 additions & 11 deletions src/utils/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,14 @@ export async function executeDeploy(
} else {
// instantiate source tracking
// stl will decide, based on the org's properties, what needs to be done
let stl: SourceTracking | undefined;
if (!opts['dry-run'] || !(await org.tracksSource())) {
stl = await SourceTracking.create({
org,
// mdapi format deploys don't require a project, but at this point we need one
project: project ?? (await SfProject.resolve()),
subscribeSDREvents: true,
ignoreConflicts: opts['ignore-conflicts'],
});
registry = stl.registry;
}
const stl = await SourceTracking.create({
org,
// mdapi format deploys don't require a project, but at this point we need one
project: project ?? (await SfProject.resolve()),
subscribeSDREvents: !opts['dry-run'] || !(await org.tracksSource()),
ignoreConflicts: opts['ignore-conflicts'],
});
registry = stl.registry;

componentSet = await buildComponentSet(opts, stl);
if (componentSet.size === 0) {
Expand Down