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: 9d8208484a35 ("appveyor: Build with OpenSSL 3.0.")
Signed-off-by: Ilya Maximets <i.maxim...@ovn.org>
---
 appveyor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index baa844753..d11e46399 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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)
 
-- 
2.44.0

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to