mirror of
https://github.com/openssl/openssl.git
synced 2025-01-30 14:01:55 +08:00
Avoid chicken and egg problem with reg setting
Because openssl with -DOSSL_WINCTX no longer falls back to build time defines, we have a chicken and egg problem. CI needs to query openssl for its version string so registry keys can be set properly, but openssl version refuses to run because no configuration file can be found So we work around it by, for the purposes of setting the registry keys, we set OPENSSL_CONF to a know config file, so that openssl version runs properly. Once the version is extracted, we can set the registry keys, and openssl will function properly without OPENSSL_CONF set Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24450)
This commit is contained in:
parent
aa4fc5ea4a
commit
a8f99f98d6
1
.github/workflows/windows.yml
vendored
1
.github/workflows/windows.yml
vendored
@ -54,6 +54,7 @@ jobs:
|
||||
- name: Gather openssl version info
|
||||
working-directory: _build
|
||||
run: |
|
||||
$Env:OPENSSL_CONF="apps\openssl.cnf"
|
||||
apps/openssl.exe version -v
|
||||
apps/openssl.exe version -v | awk '{print $2}'
|
||||
apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/'
|
||||
|
3
.github/workflows/windows_comp.yml
vendored
3
.github/workflows/windows_comp.yml
vendored
@ -36,9 +36,10 @@ jobs:
|
||||
- name: Gather openssl version info
|
||||
working-directory: _build
|
||||
run: |
|
||||
$Env:OPENSSL_CONF="apps\openssl.cnf"
|
||||
apps/openssl.exe version -v
|
||||
apps/openssl.exe version -v | awk '{print $2}'
|
||||
apps/openssl.exe version -v | awk '{print $2}' | sed -e's/\([0-9]\+\.[0-9]\+\)\(\.[0-9]\+\)\(-*.*$\)/\1/
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user