use the targetDirectory based on repo root
use the targetDirectory based on repo root
This commit is contained in:
32
dist/azure/gitreleasemanager/create/bundle.js
vendored
32
dist/azure/gitreleasemanager/create/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/azure/gitreleasemanager/discard/bundle.js
vendored
32
dist/azure/gitreleasemanager/discard/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/azure/gitreleasemanager/setup/bundle.js
vendored
32
dist/azure/gitreleasemanager/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/azure/gitversion/execute/bundle.js
vendored
2
dist/azure/gitversion/execute/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/azure/gitversion/setup/bundle.js
vendored
2
dist/azure/gitversion/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/github/gitreleasemanager/create/bundle.js
vendored
32
dist/github/gitreleasemanager/create/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/github/gitreleasemanager/discard/bundle.js
vendored
32
dist/github/gitreleasemanager/discard/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/github/gitreleasemanager/setup/bundle.js
vendored
32
dist/github/gitreleasemanager/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/github/gitversion/execute/bundle.js
vendored
2
dist/github/gitversion/execute/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/github/gitversion/setup/bundle.js
vendored
2
dist/github/gitversion/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/mock/gitreleasemanager/create/bundle.js
vendored
32
dist/mock/gitreleasemanager/create/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/mock/gitreleasemanager/discard/bundle.js
vendored
32
dist/mock/gitreleasemanager/discard/bundle.js
vendored
File diff suppressed because one or more lines are too long
32
dist/mock/gitreleasemanager/setup/bundle.js
vendored
32
dist/mock/gitreleasemanager/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/mock/gitversion/execute/bundle.js
vendored
2
dist/mock/gitversion/execute/bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/mock/gitversion/setup/bundle.js
vendored
2
dist/mock/gitversion/setup/bundle.js
vendored
File diff suppressed because one or more lines are too long
@@ -59,9 +59,9 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana
|
|||||||
if (settings.milestone) {
|
if (settings.milestone) {
|
||||||
args.push("--milestone", settings.milestone);
|
args.push("--milestone", settings.milestone);
|
||||||
}
|
}
|
||||||
if (settings.targetDirectory) {
|
settings.targetDirectory = this.getRepoDir(settings.targetDirectory);
|
||||||
args.push("--targetDirectory", settings.targetDirectory);
|
|
||||||
}
|
args.push("--targetDirectory", settings.targetDirectory);
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
@@ -78,9 +78,11 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana
|
|||||||
if (settings.commit) {
|
if (settings.commit) {
|
||||||
args.push("--targetcommitish", settings.commit);
|
args.push("--targetcommitish", settings.commit);
|
||||||
}
|
}
|
||||||
if (settings.targetDirectory) {
|
|
||||||
args.push("--targetDirectory", settings.targetDirectory);
|
settings.targetDirectory = this.getRepoDir(settings.targetDirectory);
|
||||||
}
|
|
||||||
|
args.push("--targetDirectory", settings.targetDirectory);
|
||||||
|
|
||||||
if (settings.inputFileName) {
|
if (settings.inputFileName) {
|
||||||
if (this.buildAgent.fileExists(settings.inputFileName)) {
|
if (this.buildAgent.fileExists(settings.inputFileName)) {
|
||||||
args.push("--inputFilePath", settings.inputFileName);
|
args.push("--inputFilePath", settings.inputFileName);
|
||||||
@@ -92,9 +94,28 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana
|
|||||||
args.push("--pre");
|
args.push("--pre");
|
||||||
}
|
}
|
||||||
if (settings.assets && settings.assets.length > 0) {
|
if (settings.assets && settings.assets.length > 0) {
|
||||||
|
settings.assets = settings.assets.map(asset => {
|
||||||
|
return path.join(settings.targetDirectory, asset)
|
||||||
|
})
|
||||||
|
|
||||||
args.push("--assets", settings.assets.join(","));
|
args.push("--assets", settings.assets.join(","));
|
||||||
}
|
}
|
||||||
|
|
||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private getRepoDir(targetPath: string): string {
|
||||||
|
let workDir: string;
|
||||||
|
const srcDir = this.buildAgent.getSourceDir();
|
||||||
|
if (!targetPath) {
|
||||||
|
workDir = srcDir;
|
||||||
|
} else {
|
||||||
|
if (this.buildAgent.directoryExists(targetPath)) {
|
||||||
|
workDir = path.join(srcDir, targetPath);
|
||||||
|
} else {
|
||||||
|
throw new Error("Directory not found at " + targetPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return workDir.replace(/\\/g, "/");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import path = require("path");
|
import path = require("path");
|
||||||
|
|
||||||
import { injectable, inject } from "inversify";
|
import { injectable, inject } from "inversify";
|
||||||
import { IExecResult, IBuildAgent, TYPES } from "../../core/models";
|
import { IExecResult, IBuildAgent, TYPES } from "../../core/models";
|
||||||
import { DotnetTool, IDotnetTool } from "../../core/dotnet-tool";
|
import { DotnetTool, IDotnetTool } from "../../core/dotnet-tool";
|
||||||
|
|||||||
Reference in New Issue
Block a user