Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openssl: new wrapper targeting OpenSSL 3+ #1336

Draft
wants to merge 15 commits into
base: devel
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ jobs:
uses: johnwason/vcpkg-action@v6
with:
pkgs: >-
openssl
pcre
pkgconf
sqlite3
triplet: x64-mingw-dynamic-release
extra-args: --overlay-triplets=${{ github.workspace }}/tools/vcpkg/triplets --host-triplet=x64-mingw-dynamic-release
Expand Down Expand Up @@ -243,12 +245,41 @@ jobs:
- name: Add DLLs to PATH (Windows)
if: runner.os == 'Windows'
run: |
$binPath = Join-Path $PWD "vcpkg" "installed" "x64-mingw-dynamic-release" "bin"
$prefix = Join-Path $PWD "vcpkg" "installed" "x64-mingw-dynamic-release"

$binPath = Join-Path $prefix "bin"
$binPath | Out-File -Append $env:GITHUB_PATH
$pkgconfPath = Join-Path $prefix "tools" "pkgconf"
$pkgconfPath | Out-File -Append $env:GITHUB_PATH

$pcPath = (Join-Path $prefix "lib" "pkgconfig"), (Join-Path $prefix "share" "pkgconfig"), $env:PKG_CONFIG_PATH
"PKG_CONFIG_PATH=$($pcPath -join ";")" | Out-File -Append $env:GITHUB_ENV
shell: pwsh

- name: Run tester
run: ./koch.py test --batch:'${{ matrix.batch }}_${{ matrix.total_batch }}' --tryFailing all
run: |
extraArgs=()

pc=
if command -v pkgconf 2>&1 >/dev/null; then
pc=pkgconf
elif command -v pkg-config 2>&1 >/dev/null; then
pc=pkg-config
fi

if [[ -n $pc ]]; then
extraArgs+=(
"-d:nimLibcryptoLinkFlags:$("$pc" --libs libcrypto)"
"-d:nimLibsslLinkFlags:$("$pc" --libs libssl)"
)

sslVer=$("$pc" --modversion libssl)
if [[ $sslVer == 1.1.1* ]]; then
extraArgs+=("-d:nimOpenssl111")
fi
fi

./koch.py test --batch:'${{ matrix.batch }}_${{ matrix.total_batch }}' --tryFailing all "${extraArgs[@]}"

- name: Print all test errors
if: failure()
Expand Down
Loading