From 0dc66b003c7a3ba5a49d30f56769d2f4c47886cd Mon Sep 17 00:00:00 2001 From: Maksim Shilov Date: Mon, 8 Nov 2021 09:53:44 +0300 Subject: [PATCH] Resolving comments --- .github/workflows/get-tools-new-versions.yml | 2 +- .../verify-added-to-image/verify-python-parser.psm1 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/get-tools-new-versions.yml b/.github/workflows/get-tools-new-versions.yml index faa5163..6902c01 100644 --- a/.github/workflows/get-tools-new-versions.yml +++ b/.github/workflows/get-tools-new-versions.yml @@ -60,4 +60,4 @@ jobs: url: ${{ secrets.SLACK_CHANNEL_URL }} tool-name: 'Tool name' pipeline-url: '$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY/actions/runs/$env:GITHUB_RUN_ID' - text: "Detection pipeline for the new versions of a tools that not added to the toolset has failed jobs:/n/t${{ steps.get-failed-jobs.outputs.failed-jobs }}" \ No newline at end of file + text: "Missing toolset tool versions checker pipeline has failed jobs:/n/t${{ steps.get-failed-jobs.outputs.failed-jobs }}" \ No newline at end of file diff --git a/get-new-tool-versions/parsers/verify-added-to-image/verify-python-parser.psm1 b/get-new-tool-versions/parsers/verify-added-to-image/verify-python-parser.psm1 index 8eb10d5..d8c6a55 100644 --- a/get-new-tool-versions/parsers/verify-added-to-image/verify-python-parser.psm1 +++ b/get-new-tool-versions/parsers/verify-added-to-image/verify-python-parser.psm1 @@ -10,12 +10,12 @@ function Search-PythonVersionsNotOnImage { Where-Object stable -eq $true | ForEach-Object {$_.$FilterParameter.split(".")[0,1] -join"."} | Select-Object -Unique - $toolsetUrl = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/win/toolsets/toolset-2019.json" - $latestExistingMinorVesion = ((Invoke-RestMethod $toolsetUrl).toolcache | + $toolsetUrl = "https://raw.githubusercontent.com/actions/virtual-environments/main/images/win/toolsets/toolset-2022.json" + $latestVersion = ((Invoke-RestMethod $toolsetUrl).toolcache | Where-Object {$_.name -eq $ToolName -and $_.arch -eq $FilterArch}).versions | - ForEach-Object {$_.split(".")[0,1] -join"."} | Select-Object -Last 1 - $versionsToAdd = $stableReleases | Where-Object {[version]$_ -gt [version]$latestExistingMinorVesion} + $latestMinorVesion = $latestVersion.TrimEnd(".*") + $versionsToAdd = $stableReleases | Where-Object {[version]$_ -gt [version]$latestMinorVesion} return $versionsToAdd } \ No newline at end of file