Skip to content

Commit 08edb00

Browse files
committed
dist update
1 parent 05b200d commit 08edb00

File tree

6 files changed

+74
-41
lines changed

6 files changed

+74
-41
lines changed

dist/tools/libs/gitreleasemanager.mjs

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -282,96 +282,119 @@ class Runner {
282282
this.buildAgent.info(`Set ${pathVariable} to ${toolPath}`);
283283
this.buildAgent.setVariable(pathVariable, toolPath);
284284
this.buildAgent.setSucceeded("GitReleaseManager installed successfully", true);
285-
return 0;
285+
return {
286+
code: 0
287+
};
286288
} catch (error) {
287289
if (error instanceof Error) {
288290
this.buildAgent.setFailed(error.message, true);
289291
}
290-
return -1;
292+
return {
293+
code: -1,
294+
error
295+
};
291296
}
292297
}
293298
async create() {
294299
try {
295300
this.disableTelemetry();
296301
this.buildAgent.debug("Creating release");
297-
await this.gitReleaseManagerTool.create();
302+
const result = await this.gitReleaseManagerTool.create();
298303
this.buildAgent.setSucceeded("GitReleaseManager created release successfully", true);
299-
return 0;
304+
return result;
300305
} catch (error) {
301306
if (error instanceof Error) {
302307
this.buildAgent.setFailed(error.message, true);
303308
}
304-
return -1;
309+
return {
310+
code: -1,
311+
error
312+
};
305313
}
306314
}
307315
async discard() {
308316
try {
309317
this.disableTelemetry();
310318
this.buildAgent.debug("Discarding release");
311-
await this.gitReleaseManagerTool.discard();
319+
const result = await this.gitReleaseManagerTool.discard();
312320
this.buildAgent.setSucceeded("GitReleaseManager discarded release successfully", true);
313-
return 0;
321+
return result;
314322
} catch (error) {
315323
if (error instanceof Error) {
316324
this.buildAgent.setFailed(error.message, true);
317325
}
318-
return -1;
326+
return {
327+
code: -1,
328+
error
329+
};
319330
}
320331
}
321332
async close() {
322333
try {
323334
this.disableTelemetry();
324335
this.buildAgent.debug("Closing release");
325-
await this.gitReleaseManagerTool.close();
336+
const result = await this.gitReleaseManagerTool.close();
326337
this.buildAgent.setSucceeded("GitReleaseManager closed release successfully", true);
327-
return 0;
338+
return result;
328339
} catch (error) {
329340
if (error instanceof Error) {
330341
this.buildAgent.setFailed(error.message, true);
331342
}
332-
return -1;
343+
return {
344+
code: -1,
345+
error
346+
};
333347
}
334348
}
335349
async open() {
336350
try {
337351
this.disableTelemetry();
338352
this.buildAgent.debug("Opening release");
339-
await this.gitReleaseManagerTool.open();
353+
const result = await this.gitReleaseManagerTool.open();
340354
this.buildAgent.setSucceeded("GitReleaseManager opened release successfully", true);
341-
return 0;
355+
return result;
342356
} catch (error) {
343357
if (error instanceof Error) {
344358
this.buildAgent.setFailed(error.message, true);
345359
}
346-
return -1;
360+
return {
361+
code: -1,
362+
error
363+
};
347364
}
348365
}
349366
async publish() {
350367
try {
351368
this.disableTelemetry();
352369
this.buildAgent.debug("Publishing release");
353-
await this.gitReleaseManagerTool.publish();
370+
const result = await this.gitReleaseManagerTool.publish();
354371
this.buildAgent.setSucceeded("GitReleaseManager published release successfully", true);
355-
return 0;
372+
return result;
356373
} catch (error) {
357374
if (error instanceof Error) {
358375
this.buildAgent.setFailed(error.message, true);
359376
}
360-
return -1;
377+
return {
378+
code: -1,
379+
error
380+
};
361381
}
362382
}
363383
async addAsset() {
364384
try {
365385
this.disableTelemetry();
366386
this.buildAgent.debug("Adding asset to release");
367-
await this.gitReleaseManagerTool.addAsset();
387+
const result = await this.gitReleaseManagerTool.addAsset();
368388
this.buildAgent.setSucceeded("GitReleaseManager added assets to release successfully", true);
369-
return 0;
389+
return result;
370390
} catch (error) {
371391
if (error instanceof Error) {
372392
this.buildAgent.setFailed(error.message, true);
373393
}
374-
return -1;
394+
return {
395+
code: -1,
396+
error
397+
};
375398
}
376399
}
377400
disableTelemetry() {

dist/tools/libs/gitreleasemanager.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/tools/libs/gitversion.mjs

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { S as SettingsProvider, D as DotnetTool, k as keysFn } from './tools.mjs';
1+
import { S as SettingsProvider, D as DotnetTool, k as keysOf } from './tools.mjs';
22
import 'node:crypto';
33
import 'node:fs/promises';
44
import 'node:os';
@@ -20,7 +20,7 @@ var ExecuteFields = /* @__PURE__ */ ((ExecuteFields2) => {
2020
})(ExecuteFields || {});
2121

2222
class GitVersionSettingsProvider extends SettingsProvider {
23-
getGitVersionSettings() {
23+
getGitVersionExecuteSettings() {
2424
const targetPath = this.buildAgent.getInput(ExecuteFields.targetPath);
2525
const disableCache = this.buildAgent.getBooleanInput(ExecuteFields.disableCache);
2626
const disableNormalization = this.buildAgent.getBooleanInput(ExecuteFields.disableNormalization);
@@ -62,17 +62,16 @@ class GitVersionTool extends DotnetTool {
6262
get settingsProvider() {
6363
return new GitVersionSettingsProvider(this.buildAgent);
6464
}
65-
async run() {
66-
const settings = this.settingsProvider.getGitVersionSettings();
65+
async executeJson() {
66+
const settings = this.settingsProvider.getGitVersionExecuteSettings();
6767
const workDir = await this.getRepoDir(settings);
6868
await this.checkShallowClone(settings, workDir);
69-
const args = await this.getArguments(workDir, settings);
69+
const args = await this.getExecuteArguments(workDir, settings);
7070
await this.setDotnetRoot();
7171
return await this.executeTool(args);
7272
}
7373
writeGitVersionToAgent(output) {
74-
const keys = keysFn(output);
75-
for (const property of keys) {
74+
for (const property of keysOf(output)) {
7675
const name = this.toCamelCase(property);
7776
try {
7877
let value = output[property]?.toString();
@@ -91,7 +90,7 @@ class GitVersionTool extends DotnetTool {
9190
async getRepoDir(settings) {
9291
return await super.getRepoPath(settings.targetPath);
9392
}
94-
async getArguments(workDir, options) {
93+
async getExecuteArguments(workDir, options) {
9594
let args = [workDir, "/output", "json", "/output", "buildserver"];
9695
const {
9796
useConfigFile,
@@ -230,22 +229,27 @@ class Runner {
230229
this.buildAgent.info(`Set ${pathVariable} to ${toolPath}`);
231230
this.buildAgent.setVariable(pathVariable, toolPath);
232231
this.buildAgent.setSucceeded("GitVersion installed successfully", true);
233-
return 0;
232+
return {
233+
code: 0
234+
};
234235
} catch (error) {
235236
if (error instanceof Error) {
236237
this.buildAgent.setFailed(error.message, true);
237238
}
238-
return -1;
239+
return {
240+
code: -1,
241+
error
242+
};
239243
}
240244
}
241245
async execute() {
242246
try {
243247
this.disableTelemetry();
244248
this.buildAgent.info("Executing GitVersion");
245-
const result = await this.gitVersionTool.run();
249+
const result = await this.gitVersionTool.executeJson();
246250
if (result.code === 0) {
247251
this.buildAgent.info("GitVersion executed successfully");
248-
const { stdout } = result;
252+
const stdout = result.stdout;
249253
this.buildAgent.info("GitVersion output:");
250254
this.buildAgent.info("-------------------");
251255
this.buildAgent.info(stdout);
@@ -254,27 +258,33 @@ class Runner {
254258
if (stdout.lastIndexOf("{") === -1 || stdout.lastIndexOf("}") === -1) {
255259
this.buildAgent.debug("GitVersion output is not valid JSON");
256260
this.buildAgent.setFailed("GitVersion output is not valid JSON", true);
257-
return -1;
261+
return {
262+
code: -1,
263+
error: new Error("GitVersion output is not valid JSON")
264+
};
258265
} else {
259266
const jsonOutput = stdout.substring(stdout.lastIndexOf("{"), stdout.lastIndexOf("}") + 1);
260267
const gitVersionOutput = JSON.parse(jsonOutput);
261268
this.gitVersionTool.writeGitVersionToAgent(gitVersionOutput);
262269
this.buildAgent.setSucceeded("GitVersion executed successfully", true);
263-
return 0;
270+
return result;
264271
}
265272
} else {
266273
this.buildAgent.debug("GitVersion failed");
267274
const error = result.error;
268275
if (error instanceof Error) {
269276
this.buildAgent.setFailed(error.message, true);
270277
}
271-
return -1;
278+
return result;
272279
}
273280
} catch (error) {
274281
if (error instanceof Error) {
275282
this.buildAgent.setFailed(error.message, true);
276283
}
277-
return -1;
284+
return {
285+
code: -1,
286+
error
287+
};
278288
}
279289
}
280290
disableTelemetry() {

dist/tools/libs/gitversion.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/tools/libs/tools.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class SettingsProvider {
198198
}
199199
}
200200

201-
const keysFn = Object.keys;
201+
const keysOf = Object.keys;
202202

203-
export { DotnetTool as D, SettingsProvider as S, keysFn as k };
203+
export { DotnetTool as D, SettingsProvider as S, keysOf as k };
204204
//# sourceMappingURL=tools.mjs.map

dist/tools/libs/tools.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)