diff options
| author | Neil Horman <nhorman@openssl.org> | 2024-06-06 21:09:57 +0200 |
|---|---|---|
| committer | Neil Horman <nhorman@openssl.org> | 2024-07-09 10:01:44 +0200 |
| commit | c1c67561566d8d2ce0a378af110278778b9901d8 (patch) | |
| tree | 1cb6eab549843401a5e8221d94ee6ffab4845641 /.github | |
| parent | Add a unit test to validate the functionality of our reg key lookups (diff) | |
| download | openssl-c1c67561566d8d2ce0a378af110278778b9901d8.tar.xz openssl-c1c67561566d8d2ce0a378af110278778b9901d8.zip | |
Correct use of workflow ENV vars on windows
On windows ci we're using powershell operations, need to follow those
rules
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.yml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 48b906ae30..49ee29669c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -54,15 +54,18 @@ jobs: - name: Gather openssl version info working-directory: _build run: | - echo "OSSL_VERSION=$(apps/openssl.exe version -v | awk '{print $2}' | sed -e's/-.*$//')" >> $GITHUB_ENV + 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 $OSSL_VERSION - reg.exe add HKLM\SOFTWARE\OpenSSL-$OSSL_VERSION-openssl /v OPENSSLDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 - reg.exe add HKLM\SOFTWARE\OpenSSL-$OSSL_VERSION-openssl /v ENGINESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 - reg.exe add HKLM\SOFTWARE\OpenSSL-$OSSL_VERSION-openssl /v MODULESDIR /t REG_EXPAND_SZ /d TESTOPENSSLDIR /reg:32 - reg.exe query HKLM\SOFTWARE\OpenSSL-$OSSL_VERSION-openssl /v OPENSSLDIR /reg:32 + 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: get cpu info working-directory: _build continue-on-error: true |