| Message ID | 20240411233243.2912159-1-i.maximets@ovn.org |
|---|---|
| State | Accepted |
| Commit | 66a8430c70c6ab67cfd32d4cd1848a80ae445154 |
| Headers | show |
| Series | [ovs-dev] appveyor: Fix too wide OpenSSL version regexp. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/intel-ovs-compilation | success | test: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
On Fri, Apr 12, 2024 at 01:32:40AM +0200, Ilya Maximets wrote: > 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.maximets@ovn.org> Acked-by: Simon Horman <horms@ovn.org>
On 12 Apr 2024, at 1:32, Ilya Maximets wrote: > 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.maximets@ovn.org> Thanks for fixing this! AppVeyor is working again with this patch applied! Acked-by: Eelco Chaudron <echaudro@redhat.com>
On 4/12/24 11:29, Eelco Chaudron wrote: > > > On 12 Apr 2024, at 1:32, Ilya Maximets wrote: > >> 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.maximets@ovn.org> > > Thanks for fixing this! AppVeyor is working again with this patch applied! > > Acked-by: Eelco Chaudron <echaudro@redhat.com> > Thanks, Eelco and Simon! Applied. Best regards, Ilya Maximets.
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)
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.maximets@ovn.org> --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)