fix parameters parsing, format
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import {injectable} from 'inversify'
|
||||
import { injectable } from 'inversify'
|
||||
|
||||
import * as taskLib from 'azure-pipelines-task-lib/task'
|
||||
import * as toolLib from 'azure-pipelines-tool-lib/tool'
|
||||
|
||||
import {IBuildAgent, IExecResult} from '../../core/models'
|
||||
import { IBuildAgent, IExecResult } from '../../core/models'
|
||||
|
||||
@injectable()
|
||||
class BuildAgent implements IBuildAgent {
|
||||
@@ -78,7 +78,7 @@ class BuildAgent implements IBuildAgent {
|
||||
}
|
||||
|
||||
public getInput(input: string, required?: boolean): string {
|
||||
return taskLib.getInput(input, required)
|
||||
return taskLib.getInput(input, required)?.trim()
|
||||
}
|
||||
|
||||
public getListInput(input: string, required?: boolean): string[] {
|
||||
@@ -105,4 +105,4 @@ class BuildAgent implements IBuildAgent {
|
||||
}
|
||||
}
|
||||
|
||||
export {BuildAgent}
|
||||
export { BuildAgent }
|
||||
|
||||
@@ -8,9 +8,9 @@ import * as exe from '@actions/exec'
|
||||
import * as io from '@actions/io'
|
||||
import * as toolCache from '@actions/tool-cache'
|
||||
|
||||
import {injectable} from 'inversify'
|
||||
import { injectable } from 'inversify'
|
||||
|
||||
import {IBuildAgent, IExecResult} from '../../core/models'
|
||||
import { IBuildAgent, IExecResult } from '../../core/models'
|
||||
|
||||
@injectable()
|
||||
class BuildAgent implements IBuildAgent {
|
||||
@@ -115,12 +115,12 @@ class BuildAgent implements IBuildAgent {
|
||||
}
|
||||
|
||||
public getInput(input: string, required?: boolean): string {
|
||||
return core.getInput(input, {required} as core.InputOptions)
|
||||
return core.getInput(input, { required } as core.InputOptions)?.trim()
|
||||
}
|
||||
|
||||
public getListInput(input: string, required?: boolean): string[] {
|
||||
return core
|
||||
.getInput(input, {required} as core.InputOptions)
|
||||
.getInput(input, { required } as core.InputOptions)
|
||||
.split('\n')
|
||||
.filter(x => x !== '')
|
||||
}
|
||||
@@ -167,4 +167,4 @@ class BuildAgent implements IBuildAgent {
|
||||
}
|
||||
}
|
||||
|
||||
export {BuildAgent}
|
||||
export { BuildAgent }
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {injectable} from 'inversify'
|
||||
import { injectable } from 'inversify'
|
||||
|
||||
import {IBuildAgent, IExecResult} from '../../core/models'
|
||||
import { IBuildAgent, IExecResult } from '../../core/models'
|
||||
|
||||
@injectable()
|
||||
class BuildAgent implements IBuildAgent {
|
||||
@@ -108,4 +108,4 @@ class BuildAgent implements IBuildAgent {
|
||||
}
|
||||
}
|
||||
|
||||
export {BuildAgent}
|
||||
export { BuildAgent }
|
||||
|
||||
@@ -3,9 +3,9 @@ import * as os from 'os'
|
||||
import * as path from 'path'
|
||||
import * as http from 'typed-rest-client/HttpClient'
|
||||
|
||||
import {inject, injectable} from 'inversify'
|
||||
import {TYPES, IExecResult, IBuildAgent} from './models'
|
||||
import {IVersionManager} from './versionManager'
|
||||
import { inject, injectable } from 'inversify'
|
||||
import { TYPES, IExecResult, IBuildAgent } from './models'
|
||||
import { IVersionManager } from './versionManager'
|
||||
|
||||
export interface IDotnetTool {
|
||||
disableTelemetry(): void
|
||||
@@ -145,7 +145,7 @@ export class DotnetTool implements IDotnetTool {
|
||||
const body: string = await res.readBody()
|
||||
const data = JSON.parse(body).data
|
||||
|
||||
const versions = (data[0].versions as {version: string}[]).map(
|
||||
const versions = (data[0].versions as { version: string }[]).map(
|
||||
x => x.version
|
||||
)
|
||||
if (!versions || !versions.length) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {Container} from 'inversify'
|
||||
import {IVersionManager, VersionManager} from './versionManager'
|
||||
import {TYPES, IBuildAgent} from './models'
|
||||
import {BuildAgent} from '../agent/mock/build-agent'
|
||||
import { Container } from 'inversify'
|
||||
import { IVersionManager, VersionManager } from './versionManager'
|
||||
import { TYPES, IBuildAgent } from './models'
|
||||
import { BuildAgent } from '../agent/mock/build-agent'
|
||||
|
||||
const container = new Container()
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {IBuildAgent, SetupFields, ISetupSettings} from './models'
|
||||
import { IBuildAgent, SetupFields, ISetupSettings } from './models'
|
||||
|
||||
export class Settings {
|
||||
public static getSetupSettings(buildAgent: IBuildAgent): ISetupSettings {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import cmp from 'semver-compare'
|
||||
import * as semver from 'semver'
|
||||
import {injectable, inject} from 'inversify'
|
||||
import { injectable, inject } from 'inversify'
|
||||
|
||||
import {IBuildAgent, TYPES} from './models'
|
||||
import { IBuildAgent, TYPES } from './models'
|
||||
|
||||
export interface IVersionManager {
|
||||
isExplicitVersion(versionSpec: string): boolean
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {addAsset} from './main'
|
||||
import { addAsset } from './main'
|
||||
|
||||
addAsset()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {close} from './main'
|
||||
import { close } from './main'
|
||||
|
||||
close()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {create} from './main'
|
||||
import { create } from './main'
|
||||
|
||||
create()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {discard} from './main'
|
||||
import { discard } from './main'
|
||||
|
||||
discard()
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import {IBuildAgent, TYPES, SetupFields} from '../../core/models'
|
||||
import { IBuildAgent, TYPES, SetupFields } from '../../core/models'
|
||||
import {
|
||||
IGitReleaseManagerTool,
|
||||
GitReleaseManagerTool
|
||||
} from '../../tools/gitreleasemanager/tool'
|
||||
import {Settings as CommonSettings} from '../../core/settings'
|
||||
import {Settings} from '../../tools/gitreleasemanager/settings'
|
||||
import { Settings as CommonSettings } from '../../core/settings'
|
||||
import { Settings } from '../../tools/gitreleasemanager/settings'
|
||||
|
||||
import container from '../../core/ioc'
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {open} from './main'
|
||||
import { open } from './main'
|
||||
|
||||
open()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {publish} from './main'
|
||||
import { publish } from './main'
|
||||
|
||||
publish()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {setup} from './main'
|
||||
import { setup } from './main'
|
||||
|
||||
setup()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {run} from './main'
|
||||
import { run } from './main'
|
||||
|
||||
run()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import {IBuildAgent, TYPES, SetupFields} from '../../core/models'
|
||||
import {Settings as CommonSettings} from '../../core/settings'
|
||||
import {Settings} from '../../tools/gitversion/settings'
|
||||
import {IGitVersionTool, GitVersionTool} from '../../tools/gitversion/tool'
|
||||
import { IBuildAgent, TYPES } from '../../core/models'
|
||||
import { Settings as CommonSettings } from '../../core/settings'
|
||||
import { Settings } from '../../tools/gitversion/settings'
|
||||
import { IGitVersionTool, GitVersionTool } from '../../tools/gitversion/tool'
|
||||
import {
|
||||
GitVersionSettings,
|
||||
GitVersionOutput
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import 'reflect-metadata'
|
||||
import {setup} from './main'
|
||||
import { setup } from './main'
|
||||
|
||||
setup()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import {IBuildAgent} from '../../core/models'
|
||||
import { IBuildAgent } from '../../core/models'
|
||||
import {
|
||||
GitReleaseManagerSettings,
|
||||
CommonFields,
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import path = require('path')
|
||||
|
||||
import {TYPES, IBuildAgent, IExecResult} from '../../core/models'
|
||||
import {injectable, inject} from 'inversify'
|
||||
import {DotnetTool, IDotnetTool} from '../../core/dotnet-tool'
|
||||
import {IVersionManager} from '../../core/versionManager'
|
||||
import { TYPES, IBuildAgent, IExecResult } from '../../core/models'
|
||||
import { injectable, inject } from 'inversify'
|
||||
import { DotnetTool, IDotnetTool } from '../../core/dotnet-tool'
|
||||
import { IVersionManager } from '../../core/versionManager'
|
||||
|
||||
import {
|
||||
GitReleaseManagerSettings,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import {IBuildAgent} from '../../core/models'
|
||||
import { IBuildAgent } from '../../core/models'
|
||||
|
||||
import {GitVersionSettings, ExecuteFields} from './models'
|
||||
import { GitVersionSettings, ExecuteFields } from './models'
|
||||
|
||||
export class Settings {
|
||||
public static getGitVersionSettings(
|
||||
@@ -24,7 +24,7 @@ export class Settings {
|
||||
ExecuteFields.additionalArguments
|
||||
)
|
||||
|
||||
const srcDir = buildAgent.getSourceDir().replace(/\\/g, '/')
|
||||
const srcDir = buildAgent.getSourceDir()?.replace(/\\/g, '/')
|
||||
|
||||
return {
|
||||
targetPath,
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import path = require('path')
|
||||
|
||||
import {injectable, inject} from 'inversify'
|
||||
import {IExecResult, IBuildAgent, TYPES} from '../../core/models'
|
||||
import {DotnetTool, IDotnetTool} from '../../core/dotnet-tool'
|
||||
import {GitVersionSettings, GitVersionOutput, ExecuteFields} from './models'
|
||||
import {IVersionManager} from '../../core/versionManager'
|
||||
import { injectable, inject } from 'inversify'
|
||||
import { IExecResult, IBuildAgent, TYPES } from '../../core/models'
|
||||
import { DotnetTool, IDotnetTool } from '../../core/dotnet-tool'
|
||||
import { GitVersionSettings, GitVersionOutput } from './models'
|
||||
import { IVersionManager } from '../../core/versionManager'
|
||||
|
||||
export interface IGitVersionTool extends IDotnetTool {
|
||||
install(versionSpec: string, includePrerelease: boolean): Promise<void>
|
||||
@@ -43,7 +43,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
|
||||
|
||||
private getRepoDir(targetPath: string): string {
|
||||
let workDir: string
|
||||
const srcDir = this.buildAgent.getSourceDir()
|
||||
const srcDir = this.buildAgent.getSourceDir() || '.'
|
||||
if (!targetPath) {
|
||||
workDir = srcDir
|
||||
} else {
|
||||
@@ -60,7 +60,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
|
||||
workDir: string,
|
||||
options: GitVersionSettings
|
||||
): string[] {
|
||||
const args = [workDir, '/output', 'json', '/output', 'buildserver']
|
||||
const args = [workDir, '/output', 'json']
|
||||
|
||||
const {
|
||||
useConfigFile,
|
||||
@@ -102,7 +102,9 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
|
||||
}
|
||||
}
|
||||
|
||||
args.push(additionalArguments)
|
||||
if (additionalArguments) {
|
||||
args.push(additionalArguments)
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user