moved targetDirectory filed to common base

This commit is contained in:
Artur Stolear
2020-02-09 00:49:14 +02:00
parent 4bda6b5eba
commit c39eddbc81
2 changed files with 5 additions and 9 deletions

View File

@@ -2,6 +2,7 @@ export enum CommonFields {
repository = "repository", repository = "repository",
owner = "owner", owner = "owner",
token = "token", token = "token",
targetDirectory = "targetDirectory",
} }
export enum CreateFields { export enum CreateFields {
@@ -10,19 +11,18 @@ export enum CreateFields {
inputFileName = "inputFileName", inputFileName = "inputFileName",
isPreRelease = "isPreRelease", isPreRelease = "isPreRelease",
commit = "commit", commit = "commit",
targetDirectory = "targetDirectory",
assets = "assets", assets = "assets",
} }
export enum DiscardFields { export enum DiscardFields {
milestone = "milestone", milestone = "milestone",
targetDirectory = "targetDirectory",
} }
export interface GitReleaseManagerSettings { export interface GitReleaseManagerSettings {
[CommonFields.repository]: string; [CommonFields.repository]: string;
[CommonFields.owner]: string; [CommonFields.owner]: string;
[CommonFields.token]: string; [CommonFields.token]: string;
[CommonFields.targetDirectory]: string;
} }
export interface GitReleaseManagerCreateSettings extends GitReleaseManagerSettings { export interface GitReleaseManagerCreateSettings extends GitReleaseManagerSettings {
@@ -31,11 +31,9 @@ export interface GitReleaseManagerCreateSettings extends GitReleaseManagerSettin
[CreateFields.inputFileName]: string; [CreateFields.inputFileName]: string;
[CreateFields.isPreRelease]: boolean; [CreateFields.isPreRelease]: boolean;
[CreateFields.commit]: string; [CreateFields.commit]: string;
[CreateFields.targetDirectory]: string;
[CreateFields.assets]?: string[]; [CreateFields.assets]?: string[];
} }
export interface GitReleaseManagerDiscardSettings extends GitReleaseManagerSettings { export interface GitReleaseManagerDiscardSettings extends GitReleaseManagerSettings {
[DiscardFields.milestone]: string; [DiscardFields.milestone]: string;
[DiscardFields.targetDirectory]: string;
} }

View File

@@ -9,7 +9,6 @@ export class Settings {
const inputFileName = buildAgent.getInput(CreateFields.inputFileName); const inputFileName = buildAgent.getInput(CreateFields.inputFileName);
const isPreRelease = buildAgent.getBooleanInput(CreateFields.isPreRelease); const isPreRelease = buildAgent.getBooleanInput(CreateFields.isPreRelease);
const commit = buildAgent.getInput(CreateFields.commit); const commit = buildAgent.getInput(CreateFields.commit);
const targetDirectory = buildAgent.getInput(CreateFields.targetDirectory);
const assets = buildAgent.getListInput(CreateFields.assets); const assets = buildAgent.getListInput(CreateFields.assets);
const commonSettings = Settings.getCommonSettings(buildAgent); const commonSettings = Settings.getCommonSettings(buildAgent);
@@ -20,20 +19,17 @@ export class Settings {
inputFileName, inputFileName,
isPreRelease, isPreRelease,
commit, commit,
targetDirectory,
assets assets
} }
} }
public static getDiscardSettings(buildAgent: IBuildAgent) : GitReleaseManagerDiscardSettings { public static getDiscardSettings(buildAgent: IBuildAgent) : GitReleaseManagerDiscardSettings {
const milestone = buildAgent.getInput(DiscardFields.milestone); const milestone = buildAgent.getInput(DiscardFields.milestone);
const targetDirectory = buildAgent.getInput(CreateFields.targetDirectory);
const commonSettings = Settings.getCommonSettings(buildAgent); const commonSettings = Settings.getCommonSettings(buildAgent);
return { return {
...commonSettings, ...commonSettings,
milestone, milestone,
targetDirectory,
} }
} }
@@ -41,11 +37,13 @@ export class Settings {
const owner = buildAgent.getInput(CommonFields.owner, true); const owner = buildAgent.getInput(CommonFields.owner, true);
const repository = buildAgent.getInput(CommonFields.repository, true); const repository = buildAgent.getInput(CommonFields.repository, true);
const token = buildAgent.getInput(CommonFields.token, true); const token = buildAgent.getInput(CommonFields.token, true);
const targetDirectory = buildAgent.getInput(CommonFields.targetDirectory);
return { return {
owner, owner,
repository, repository,
token token,
targetDirectory,
}; };
} }
} }