Skip to content
This repository was archived by the owner on Mar 18, 2024. It is now read-only.

Commit ac3995f

Browse files
azlam-abdulsalamaly76
authored andcommitted
Fix Relative Path while checking for Empty Artifacts in YAML Pipeliens (#179)
* Fix for #178 Relative Path
1 parent 6c80d00 commit ac3995f

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

packages/azpipelines/BuildTasks/InstallSourcePackageTask/InstallSourcePackageToOrg.ts

+12-3
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ async function run() {
206206
}
207207
}
208208

209+
209210
//Construct Deploy Command for actual payload
210211
let deploymentOptions = await generateDeploymentOptions(
211212
packageMetadataFromStorage,
@@ -214,6 +215,8 @@ async function run() {
214215
skipTesting,
215216
target_org
216217
);
218+
219+
217220
let deploySourceToOrgImpl: DeploySourceToOrgImpl = new DeploySourceToOrgImpl(
218221
target_org,
219222
artifacts_filepaths[0].sourceDirectoryPath,
@@ -228,7 +231,8 @@ async function run() {
228231
tl.setVariable("sfpowerscripts_deploysource_id", result.deploy_id);
229232
}
230233

231-
if (result.result) {
234+
235+
if (result.result && !result.message.startsWith("skip:")) {
232236
console.log("Applying Post Deployment Activites");
233237
//Apply PostDeployment Activities
234238
try {
@@ -256,7 +260,11 @@ async function run() {
256260
target_org: target_org,
257261
sub_directory: subdirectory,
258262
});
259-
} else {
263+
} else if(result.result && result.message.startsWith("skip:"))
264+
{
265+
tl.setResult(tl.TaskResult.Skipped, result.message);
266+
}
267+
else {
260268
//Update existing environment map
261269
packageMetadataFromStorage.deployments.push({
262270
target_org: target_org,
@@ -270,7 +278,8 @@ async function run() {
270278
extensionName
271279
);
272280
tl.setResult(tl.TaskResult.Succeeded, result.message);
273-
} else {
281+
}
282+
else {
274283
tl.error(result.message);
275284
tl.setResult(
276285
tl.TaskResult.Failed,

packages/core/src/generators/MDAPIPackageGenerator.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ export default class MDAPIPackageGenerator {
139139
if (err.code === "ENOENT") {
140140
throw new Error(`No such file or directory ${err.path}`); // Re-throw error if .forceignore does not exist
141141
} else if (!isToBreakBuildIfEmpty) {
142-
status.message = `Something wrong with the path provided ${directoryToCheck},,but skipping `;
142+
143+
status.message = `Something wrong with the path provided ${directoryToCheck},,but skipping, The exception is ${err}`;
143144
status.result = "skip";
144145
return status;
145146
} else throw err;
@@ -164,7 +165,7 @@ export default class MDAPIPackageGenerator {
164165
// Construct file paths that are relative to the project directory.
165166
files.forEach((file, index, files) => {
166167
let filepath = path.join(dirToCheck, file);
167-
files[index] = path.relative(process.cwd(), filepath);
168+
files[index] = path.relative(projectDirectory==null?process.cwd():projectDirectory, filepath);
168169
});
169170

170171
let forceignorePath;

packages/core/src/sfdxwrappers/DeploySourceToOrgImpl.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default class DeploySourceToOrgImpl {
3838
return deploySourceResult;
3939
} else if (status.result == "skip") {
4040
deploySourceResult.result = true;
41-
deploySourceResult.message = status.message;
41+
deploySourceResult.message = "skip:"+status.message;
4242
return deploySourceResult;
4343
}
4444

0 commit comments

Comments
 (0)