From b763a6b6c4d68b06ee6072bcb092cb5126ca4868 Mon Sep 17 00:00:00 2001 From: Maksim Shilov Date: Mon, 1 Nov 2021 13:51:12 +0300 Subject: [PATCH] Removing unused code from the previous notifications --- azure-pipelines/get-tool-versions-xamarin.yml | 37 ------------------- azure-pipelines/templates/check-versions.yml | 2 +- .../get-new-tool-versions.ps1 | 14 ++----- .../parsers/parsers-factory.psm1 | 2 - .../parsers/xamarin-parser.psm1 | 30 --------------- 5 files changed, 4 insertions(+), 81 deletions(-) delete mode 100644 azure-pipelines/get-tool-versions-xamarin.yml delete mode 100644 get-new-tool-versions/parsers/xamarin-parser.psm1 diff --git a/azure-pipelines/get-tool-versions-xamarin.yml b/azure-pipelines/get-tool-versions-xamarin.yml deleted file mode 100644 index 866f810..0000000 --- a/azure-pipelines/get-tool-versions-xamarin.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: $(date:yyyyMMdd)$(rev:.r) -trigger: none -pr: none -schedules: -- cron: "0 8 * * Thu" - displayName: Daily build - branches: - include: - - main - always: true - -variables: - PoolName: 'Azure Pipelines' - VmImage: 'ubuntu-18.04' - -stages: -- stage: Find_New_Versions - dependsOn: [] - jobs: - - job: Find_New_Versions - pool: - name: $(PoolName) - vmImage: $(VmImage) - steps: - - template: /azure-pipelines/templates/get-tool-versions-steps.yml - -- stage: Check_New_Versions - dependsOn: Find_New_Versions - jobs: - - job: Check_New_Versions - pool: - name: $(PoolName) - vmImage: $(VmImage) - variables: - ToolVersions: $[ stageDependencies.Find_New_Versions.Find_New_Versions.outputs['Get_versions.TOOL_VERSIONS'] ] - steps: - - template: /azure-pipelines/templates/check-versions.yml diff --git a/azure-pipelines/templates/check-versions.yml b/azure-pipelines/templates/check-versions.yml index 9af96ef..084c913 100644 --- a/azure-pipelines/templates/check-versions.yml +++ b/azure-pipelines/templates/check-versions.yml @@ -21,7 +21,7 @@ steps: TargetType: inline script: | $ToolName = "$(TOOL_NAME)" - if ($ToolName -in @("Python", "Xamarin")) { + if ($ToolName -eq "Python") { $PipelineUrl = " " } else { $PipelineUrl = "$(System.TeamFoundationCollectionUri)$(System.TeamProject)/_build/results?buildId=$(Build.BuildId)" diff --git a/get-new-tool-versions/get-new-tool-versions.ps1 b/get-new-tool-versions/get-new-tool-versions.ps1 index 558dd0f..e8342ed 100644 --- a/get-new-tool-versions/get-new-tool-versions.ps1 +++ b/get-new-tool-versions/get-new-tool-versions.ps1 @@ -3,7 +3,7 @@ Check and return list of new available tool versions .PARAMETER ToolName -Required parameter. The name of tool for which parser is available (Node, Go, Python, Xamarin) +Required parameter. The name of tool for which parser is available (Node, Go, Python) #> param ( @@ -16,18 +16,10 @@ $ToolVersionParser = Get-ToolVersionsParser -ToolName $ToolName $VersionsFromDist = $ToolVersionParser.GetAvailableVersions() $VersionsFromManifest = $ToolVersionParser.GetUploadedVersions() -$joinChars = ", " -if ($ToolName -eq "Xamarin") { - $VersionsToBuild = $VersionsFromDist | Where-Object { $VersionsFromManifest[$_.name] -notcontains $_.version } | ForEach-Object {[string]::Empty} { - '{0,-15} : {1}' -f $_.name, $_.version - } - $joinChars = "\n\t" -} else { - $VersionsToBuild = $VersionsFromDist | Where-Object { $VersionsFromManifest -notcontains $_ } -} +$VersionsToBuild = $VersionsFromDist | Where-Object { $VersionsFromManifest -notcontains $_ } if ($VersionsToBuild) { - $availableVersions = $VersionsToBuild -join $joinChars + $availableVersions = $VersionsToBuild -join ", " Write-Host "The following versions are available to build:`n${availableVersions}" Write-Host "::set-output name=TOOL_VERSIONS::${availableVersions}" Write-Host "##vso[task.setvariable variable=TOOL_VERSIONS;isOutput=true]${availableVersions}" diff --git a/get-new-tool-versions/parsers/parsers-factory.psm1 b/get-new-tool-versions/parsers/parsers-factory.psm1 index 199136c..eb9b69c 100644 --- a/get-new-tool-versions/parsers/parsers-factory.psm1 +++ b/get-new-tool-versions/parsers/parsers-factory.psm1 @@ -1,7 +1,6 @@ using module "./node-parser.psm1" using module "./go-parser.psm1" using module "./python-parser.psm1" -using module "./xamarin-parser.psm1" function Get-ToolVersionsParser { param( @@ -13,7 +12,6 @@ function Get-ToolVersionsParser { "Node" { return [NodeVersionsParser]::New() } "Go" { return [GoVersionsParser]::New() } "Python" { return [PythonVersionsParser]::New() } - "Xamarin" { return [XamarinversionsParser]::New() } Default { throw "Unknown tool name" } diff --git a/get-new-tool-versions/parsers/xamarin-parser.psm1 b/get-new-tool-versions/parsers/xamarin-parser.psm1 deleted file mode 100644 index fb5c135..0000000 --- a/get-new-tool-versions/parsers/xamarin-parser.psm1 +++ /dev/null @@ -1,30 +0,0 @@ -using module "./base-parser.psm1" - -class XamarinVersionsParser: BaseVersionsParser { - [PSCustomObject] GetAvailableVersions() { - $allVersions = $this.ParseAllAvailableVersions() - return $allVersions - } - - [hashtable] GetUploadedVersions() { - $url = $this.BuildGitHubFileUrl("actions", "virtual-environments", "main", "images/macos/toolsets/toolset-11.json") - $releases = Invoke-RestMethod $url -MaximumRetryCount $this.ApiRetryCount -RetryIntervalSec $this.ApiRetryIntervalSeconds - $xamarin = $releases.xamarin - $xamarinReleases = @{ - 'Mono Framework' = $xamarin.'mono-versions' - 'Xamarin.Android' = $xamarin.'android-versions' - 'Xamarin.iOS' = $xamarin.'ios-versions' - 'Xamarin.Mac' = $xamarin.'mac-versions' - } - return $xamarinReleases - } - - hidden [PSCustomObject] ParseAllAvailableVersions() { - $url = "http://aka.ms/manifest/stable" - $filteredProducts = @('Mono Framework', 'Xamarin.Android', 'Xamarin.iOS', 'Xamarin.Mac') - $releases = Invoke-RestMethod $url -MaximumRetryCount $this.ApiRetryCount -RetryIntervalSec $this.ApiRetryIntervalSeconds - $items = $releases.items - $products = $items | Where-Object {$_.name -in $filteredProducts} | Sort-Object name | Select-Object name, version - return $products - } -} \ No newline at end of file