diff options
| author | Neil Horman <nhorman@openssl.org> | 2024-06-21 12:18:00 -0400 |
|---|---|---|
| committer | Neil Horman <nhorman@openssl.org> | 2024-07-09 04:01:44 -0400 |
| commit | 4fc9e5e0110e7199eaca43f54d604e36ce579567 (patch) | |
| tree | ba73c5a9f215d0fdf44f920a45999a9b89223344 /.github | |
| parent | 901e27982c6bcd5ac94e455d2ef87e80398cd474 (diff) | |
update windows_comp ci run to use new registry reads
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24450)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows_comp.yml | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml index 104e93d409..2bf2332a23 100644 --- a/.github/workflows/windows_comp.yml +++ b/.github/workflows/windows_comp.yml @@ -33,10 +33,25 @@ jobs: working-directory: _build run: | vcpkg install zstd:x64-windows + - name: Gather openssl version info + working-directory: _build + 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 + - name: Set registry keys + working-directory: _build + run: | + echo ${Env:OSSL_VERSION} + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32 - name: config working-directory: _build run: | - perl ..\Configure enable-comp enable-zstd --with-zstd-include=C:\vcpkg\packages\zstd_x64-windows\include --with-zstd-lib=C:\vcpkg\packages\zstd_x64-windows\lib\zstd.lib no-makedepend VC-WIN64A + perl ..\Configure enable-comp enable-zstd --with-zstd-include=C:\vcpkg\packages\zstd_x64-windows\include --with-zstd-lib=C:\vcpkg\packages\zstd_x64-windows\lib\zstd.lib no-makedepend -DOSSL_WINCTX=openssl VC-WIN64A perl configdata.pm --dump - name: build working-directory: _build @@ -75,10 +90,25 @@ jobs: working-directory: _build run: | vcpkg install brotli:x64-windows + - name: Gather openssl version info + working-directory: _build + 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 + - name: Set registry keys + working-directory: _build + run: | + echo ${Env:OSSL_VERSION} + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe add HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 + reg.exe query HKLM\SOFTWARE\OpenSSL-${Env:OSSL_VERSION}-openssl /v OPENSSLDIR /reg:32 - name: config working-directory: _build run: | - perl ..\Configure enable-comp enable-brotli --with-brotli-include=C:\vcpkg\packages\brotli_x64-windows\include --with-brotli-lib=C:\vcpkg\packages\brotli_x64-windows\lib no-makedepend VC-WIN64A + perl ..\Configure enable-comp enable-brotli --with-brotli-include=C:\vcpkg\packages\brotli_x64-windows\include --with-brotli-lib=C:\vcpkg\packages\brotli_x64-windows\lib no-makedepend -DOSSL_WINCTX=openssl VC-WIN64A perl configdata.pm --dump - name: build working-directory: _build |