Adjust ci to only use major.minor when setting reg keys

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24450)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7790145b8c9ef096188938e71ac52808cab3ddbc..110ac4bed9480e2faa00d08dbacb044616066d68 100644 (file)
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -56,8 +56,8 @@ jobs:
       run: |
         apps/openssl.exe version -v
         apps/openssl.exe version -v | awk '{print $2}'
-        apps/openssl.exe version -v | awk '{print $2}' | sed -e's/-.*$//'
-        echo "OSSL_VERSION=$(apps/openssl.exe version -v | awk '{print $2}' | sed -e's/-.*$//')" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+        apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/'
+        echo "OSSL_VERSION=$(apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/')" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
     - name: Set registry keys
       working-directory: _build
       run: |

diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml
index 2bf2332a239c5dbae1f9419586c819eef0574a23..fcdf7905a42eda46b9957602f85960923bab7dab 100644 (file)
--- a/.github/workflows/windows_comp.yml
+++ b/.github/workflows/windows_comp.yml
@@ -38,8 +38,8 @@ jobs:
       run: |
         apps/openssl.exe version -v
         apps/openssl.exe version -v | awk '{print $2}'
-        apps/openssl.exe version -v | awk '{print $2}' | sed -e's/-.*$//'
-        echo "OSSL_VERSION=$(apps/openssl.exe version -v | awk '{print $2}' | sed -e's/-.*$//')" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+        apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/ 
+        echo "OSSL_VERSION=$(apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/')" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
     - name: Set registry keys
       working-directory: _build
       run: |