diff --git a/src/appservice-rest/Kudu/azure-app-kudu-service.ts b/src/appservice-rest/Kudu/azure-app-kudu-service.ts index a98df3a2f..cf01afe5c 100644 --- a/src/appservice-rest/Kudu/azure-app-kudu-service.ts +++ b/src/appservice-rest/Kudu/azure-app-kudu-service.ts @@ -6,7 +6,6 @@ import { KuduServiceClient } from './KuduServiceClient'; import { exists } from '@actions/io/lib/io-util'; import core = require('@actions/core'); -import { CANCELLED } from 'dns'; export const KUDU_DEPLOYMENT_CONSTANTS = { CANCELLED: -1, diff --git a/src/handlers/contentPreparer.ts b/src/handlers/contentPreparer.ts index 6b2197211..3cd62cce0 100644 --- a/src/handlers/contentPreparer.ts +++ b/src/handlers/contentPreparer.ts @@ -163,7 +163,7 @@ export class ContentPreparer implements IOrchestratable { "You can use it to exclude files from deployment.") return } - + FuncIgnore.removeFilesFromFuncIgnore(packagePath, funcignoreParser); return; } diff --git a/src/handlers/parameterValidator.ts b/src/handlers/parameterValidator.ts index d503c7349..dd3e6bf94 100644 --- a/src/handlers/parameterValidator.ts +++ b/src/handlers/parameterValidator.ts @@ -25,10 +25,10 @@ export class ParameterValidator implements IOrchestratable { private _respectPomXml: string; private _respectFuncignore: string; private _scmDoBuildDuringDeployment: string; - private _remoteBuild: string; private _enableOryxBuild: string; private _scmCredentials: IScmCredentials private _sku: string; + private _remoteBuild: string; constructor() { this.parseScmCredentials = this.parseScmCredentials.bind(this); @@ -44,9 +44,9 @@ export class ParameterValidator implements IOrchestratable { this._respectPomXml = core.getInput(ConfigurationConstant.ParamInRespectPomXml); this._respectFuncignore = core.getInput(ConfigurationConstant.ParamInRespectFuncignore); this._scmDoBuildDuringDeployment = core.getInput(ConfigurationConstant.ParamInScmDoBuildDuringDeployment); - this._remoteBuild = core.getInput(ConfigurationConstant.ParamInRemoteBuild); this._enableOryxBuild = core.getInput(ConfigurationConstant.ParamInEnableOryxBuild); this._sku = core.getInput(ConfigurationConstant.ParamInSku); + this._remoteBuild = core.getInput(ConfigurationConstant.ParamInRemoteBuild); // Validate field if (this._slot !== undefined && this._slot.trim() === "") { @@ -66,9 +66,9 @@ export class ParameterValidator implements IOrchestratable { params.respectPomXml = Parser.IsTrueLike(this._respectPomXml); params.respectFuncignore = Parser.IsTrueLike(this._respectFuncignore); params.scmDoBuildDuringDeployment = ScmBuildUtil.FromString(this._scmDoBuildDuringDeployment); - params.remoteBuild = Parser.IsTrueLike(this._remoteBuild); params.enableOryxBuild = EnableOryxBuildUtil.FromString(this._enableOryxBuild); params.sku = this._sku.toLowerCase(); + params.remoteBuild = Parser.IsTrueLike(this._remoteBuild); return params; } diff --git a/src/interfaces/IActionParameters.ts b/src/interfaces/IActionParameters.ts index ebae18779..b968f888b 100644 --- a/src/interfaces/IActionParameters.ts +++ b/src/interfaces/IActionParameters.ts @@ -9,7 +9,7 @@ export interface IActionParameters { respectPomXml: boolean; respectFuncignore: boolean; scmDoBuildDuringDeployment: ScmBuildConstant; - remoteBuild: boolean; enableOryxBuild: EnableOryxBuildConstant; sku: string; + remoteBuild: boolean; } \ No newline at end of file diff --git a/src/managers/builder.ts b/src/managers/builder.ts index 5deacf7e2..866e14bcc 100644 --- a/src/managers/builder.ts +++ b/src/managers/builder.ts @@ -23,9 +23,9 @@ export class Builder { respectPomXml: false, respectFuncignore: false, scmDoBuildDuringDeployment: ScmBuildConstant.Disabled, - remoteBuild: false, enableOryxBuild: EnableOryxBuildConstant.Disabled, - sku: undefined + sku: undefined, + remoteBuild: false } }