Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1137 - use milestone for the action field for every GRM actions #1154

Merged
merged 1 commit into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions src/tools/gitreleasemanager/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ export enum OpenFields {
}

export enum PublishFields {
tagName = 'tagName'
milestone = 'milestone'
}

export enum AddAssetFields {
tagName = 'tagName',
milestone = 'milestone',
assets = 'assets'
}

Expand Down Expand Up @@ -66,10 +66,10 @@ export interface GitReleaseManagerOpenSettings extends GitReleaseManagerSettings
}

export interface GitReleaseManagerPublishSettings extends GitReleaseManagerSettings {
[PublishFields.tagName]: string
[PublishFields.milestone]: string
}

export interface GitReleaseManagerAddAssetSettings extends GitReleaseManagerSettings {
[AddAssetFields.tagName]: string
[AddAssetFields.milestone]: string
[AddAssetFields.assets]: string[]
}
8 changes: 4 additions & 4 deletions src/tools/gitreleasemanager/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,23 @@ export class GitReleaseManagerSettingsProvider extends SettingsProvider implemen
}

public getPublishSettings(): GitReleaseManagerPublishSettings {
const tagName = this.buildAgent.getInput(PublishFields.tagName)
const milestone = this.buildAgent.getInput(PublishFields.milestone)

const commonSettings = this.getCommonSettings()
return {
...commonSettings,
tagName
milestone
}
}

public getAddAssetSettings(): GitReleaseManagerAddAssetSettings {
const tagName = this.buildAgent.getInput(AddAssetFields.tagName)
const milestone = this.buildAgent.getInput(AddAssetFields.milestone)
const assets = this.buildAgent.getListInput(AddAssetFields.assets)

const commonSettings = this.getCommonSettings()
return {
...commonSettings,
tagName,
milestone,
assets
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/tools/gitreleasemanager/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana
private getPublishArguments(settings: GitReleaseManagerPublishSettings): string[] {
const args: string[] = ['publish', ...this.getCommonArguments(settings)]

if (settings.tagName) {
args.push('--tagName', settings.tagName)
if (settings.milestone) {
args.push('--tagName', settings.milestone)
}

return args
Expand All @@ -194,8 +194,8 @@ export class GitReleaseManagerTool extends DotnetTool implements IGitReleaseMana
private getAddAssetArguments(settings: GitReleaseManagerAddAssetSettings): string[] {
const args: string[] = ['addasset', ...this.getCommonArguments(settings)]

if (settings.tagName) {
args.push('--tagName', settings.tagName)
if (settings.milestone) {
args.push('--tagName', settings.milestone)
}
if (settings.assets && settings.assets.length > 0) {
settings.assets = settings.assets.map(asset => {
Expand Down