From aa4fc5ea4a0da5f5f2c1fedf1f2727047d3a6eff Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 28 Jun 2024 07:28:36 -0400 Subject: [PATCH] Adjust ci to only use major.minor when setting reg keys Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/24450) --- .github/workflows/windows.yml | 4 ++-- .github/workflows/windows_comp.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7790145b8c..110ac4bed9 100644 --- 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 2bf2332a23..fcdf7905a4 100644 --- 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: |