Skip to content

Commit

Permalink
appveyor: Fix too wide OpenSSL version regexp.
Browse files Browse the repository at this point in the history
Current regexp is not good enough.  OpenSSL 3.3.0 is now available
and unfortunately the regexp is matching both 3.3.0 and 3.0.13.

All the AppVeyor runs are currently failing because of this.

Making it more restrictive by matching on the start of the string,
explicit dots and numbers after the last dot.  Hopefully, this is
good enough.

In addition, taking only the first result just in case it mismatches
again.

Fixes: 9d82084 ("appveyor: Build with OpenSSL 3.0.")
Acked-by: Simon Horman <[email protected]>
Acked-by: Eelco Chaudron <[email protected]>
Signed-off-by: Ilya Maximets <[email protected]>
  • Loading branch information
igsilya committed Apr 12, 2024
1 parent e1e0c6a commit 66a8430
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ install:
$URL = "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json"
$webData = (Invoke-WebRequest -Uri $URL).content | ConvertFrom-Json
$source = ($webData.files.PSObject.Properties | Where-Object {
$_.Value.basever -match "3.0.*" -and
$_.Value.bits -eq "64" -and
$_.Value.arch -eq "INTEL" -and
$_.Value.installer -eq "exe" -and
$_.Value.basever -match "^3\.0\.[0-9]+" -and
$_.Value.bits -eq "64" -and
$_.Value.arch -eq "INTEL" -and
$_.Value.installer -eq "exe" -and
-not $_.Value.light
} | Select-Object Value).PSObject.Properties.Value
} | Select-Object Value | Select -First 1).PSObject.Properties.Value
Write-Host "Latest OpenSSL 3.0:" ($source | Format-List | Out-String)
Expand Down

0 comments on commit 66a8430

Please sign in to comment.