diff --git a/get-new-tool-versions/get-new-tool-versions.ps1 b/get-new-tool-versions/get-new-tool-versions.ps1 index de31ffd..4672876 100644 --- a/get-new-tool-versions/get-new-tool-versions.ps1 +++ b/get-new-tool-versions/get-new-tool-versions.ps1 @@ -29,11 +29,8 @@ if ($ToolName -eq "Xamarin") { if ($VersionsToBuild) { $availableVersions = $VersionsToBuild -join $joinChars Write-Host "The following versions are available to build:`n${availableVersions}" - if ($ToolName -eq "Go") { - Write-Host "::set-output name=version_number::${availableVersions}" - } else { - Write-Host "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]${availableVersions}" - } + Write-Host "::set-output name=version_number::${availableVersions}" + Write-Host "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]${availableVersions}" } else { Write-Host "There aren't versions to build" } diff --git a/get-new-tool-versions/send-slack-notification.ps1 b/get-new-tool-versions/send-slack-notification.ps1 index 3f3518a..05be9c6 100644 --- a/get-new-tool-versions/send-slack-notification.ps1 +++ b/get-new-tool-versions/send-slack-notification.ps1 @@ -7,11 +7,13 @@ Required parameter. Incoming Webhook URL to post a message .PARAMETER ToolName Required parameter. The name of tool .PARAMETER ToolVersion -Required parameter. Specifies the version of tool +Optional parameter. Specifies the version of tool .PARAMETER PipelineUrl -Required parameter. The pipeline URL +Optional parameter. The pipeline URL .PARAMETER ImageUrl Optional parameter. The image URL +.PARAMETER Text +Optional parameter. The message to post #> param( @@ -23,25 +25,25 @@ param( [ValidateNotNullOrEmpty()] [System.String]$ToolName, - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] [System.String]$ToolVersion, - [System.String]$PipelineUrl, - [System.String]$ImageUrl = 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png' + [System.String]$ImageUrl = 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png', + [System.String]$Text ) # Import helpers module Import-Module $PSScriptRoot/helpers.psm1 -DisableNameChecking # Create JSON body -if ($toolName -eq "Xamarin") { - $text = "The following versions of '$toolName' are available, consider adding them to toolset: $toolVersion" -} else { - $text = "The following versions of '$toolName' are available to upload: $toolVersion" -} -if (-not ([string]::IsNullOrWhiteSpace($PipelineUrl))) { - $text += "\nLink to the pipeline: $pipelineUrl" +if ([string]::IsNullOrWhiteSpace($Text)) { + if ($toolName -eq "Xamarin") { + $Text = "The following versions of '$toolName' are available, consider adding them to toolset: $toolVersion" + } else { + $Text = "The following versions of '$toolName' are available to upload: $toolVersion" + } + if (-not ([string]::IsNullOrWhiteSpace($PipelineUrl))) { + $Text += "\nLink to the pipeline: $pipelineUrl" + } } $jsonBodyMessage = @" { @@ -50,7 +52,7 @@ $jsonBodyMessage = @" "type": "section", "text": { "type": "mrkdwn", - "text": "$text" + "text": "$Text" }, "accessory": { "type": "image",