From a82df03a46164dde46db7a43de72cc4c2092983b Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Fri, 22 Nov 2024 17:54:13 +0100 Subject: [PATCH] fix(freecad): update release name regex Match new names with v1: FreeCAD_1.0.0-conda-Windows-x86_64-installer-1.exe FreeCAD_1.0.0-conda-Windows-x86_64-py311.7z --- automatic/freecad/update_helper.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/automatic/freecad/update_helper.ps1 b/automatic/freecad/update_helper.ps1 index b21cfb7defc..a244c357994 100644 --- a/automatic/freecad/update_helper.ps1 +++ b/automatic/freecad/update_helper.ps1 @@ -32,9 +32,8 @@ param( } 'portable' { $download_page = (Get-GitHubRelease -Owner "Freecad" -Name "Freecad" -Verbose).assets - $mobile = "portable" $ext = "7z" - $re64 = "(FreeCAD\-)((\d+)?(\.))+?(\d)?(\-)(Windows)(\-)?(x\d{2})(\-|.)?(\d+)?(\.${ext})$" + $re64 = "(FreeCAD_)?((\d+)?(\.))+?(\d)?(\-conda)?(\-Windows)(\-|.)?(x\d{2}_\d{2}\-)?(py\d{2,5})?(\.${ext})$" # $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' ) $url64 = ( $download_page | Where-Object Name -match $re64 | Select-Object -First 1 -ExpandProperty 'browser_download_url' ) $vert = "$version" @@ -44,9 +43,8 @@ param( } 'stable' { $download_page = (Get-GitHubRelease -Owner "Freecad" -Name "Freecad" -Verbose).assets - $mobile = "installer" $ext = "exe" - $re64 = "(FreeCAD\-)((\d+)?(\.))+?(\d)?(\-)(WIN)(\-)?(x\d{2})\-(${mobile})(\-|.)?(\d+)?(\.${ext})$" + $re64 = "(FreeCAD_)?((\d+)?(\.))+?(\d)?(\-conda)?(\-Windows)(\-|.)?(x\d{2}_\d{2}\-)?(installer)?(\-|.)?(\d+)?(\.${ext})$" # $url64 = ( $download_page.Links | ? href -match $re64 | Sort-Object -Property 'href' -Descending | Select-Object -First 1 -ExpandProperty 'href' ) $url64 = ( $download_page | Where-Object Name -match $re64 | Select-Object -First 1 -ExpandProperty 'browser_download_url' ) $vert = "$version"