Skip to content

Commit e9441dc

Browse files
committed
Try applink fix
1 parent 6f16119 commit e9441dc

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Diff for: .github/workflows/test.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@ jobs:
1818
run: vcpkg install libuv zlib:x64-windows-static krb5 openssl
1919
- name: Setup env vars
2020
run: |
21+
echo "ZLIB_LIB_DIR=${{ env.LIBUV_ROOT_DIR }}\bin" >> $env:GITHUB_ENV
2122
echo "LIBUV_BIN_DIR=${{ env.LIBUV_ROOT_DIR }}\bin" >> $env:GITHUB_ENV
2223
echo "KERBEROS_BIN_DIR=${{ env.KERBEROS_ROOT_DIR }}\bin" >> $env:GITHUB_ENV
2324
echo "OPENSSL_BIN_DIR=${{ env.OPENSSL_ROOT_DIR }}\bin" >> $env:GITHUB_ENV
24-
- name: Setup env
25+
echo "OPENSSL_INCLUDE_DIR=${{ env.OPENSSL_ROOT_DIR }}\include" >> $env:GITHUB_ENV
26+
- name: Set PATH to find vcpkg dependencies
2527
run: |
26-
ln -s C:\vcpkg\packages\zlib_x64-windows-static\lib\zlib.lib C:\vcpkg\packages\zlib_x64-windows-static\lib\zlibstatic.lib
2728
echo "PATH=${{ env.PATH }};${{ env.LIBUV_BIN_DIR }};${{ env.KERBEROS_BIN_DIR }};${{ env.OPENSSL_BIN_DIR }}" >> $env:GITHUB_ENV
28-
- name: Debug stuff
29+
- name: Link OpenSSL applink.c into src
2930
run: |
30-
echo "PATH is ${{ env.PATH }}"
31-
echo "LIBUV_BIN_DIR contents:"
32-
ls ${{ env.LIBUV_BIN_DIR }}
33-
echo "KERBEROS_BIN_DIR contents:"
34-
ls ${{ env.KERBEROS_BIN_DIR }}
31+
echo "OPENSSL_INCLUDE_DIR contents:"
32+
ls ${{ env.OPENSSL_INCLUDE_DIR }}
33+
ln -s ${{ env.OPENSSL_INCLUDE_DIR }}\applink.c src\applink.c
34+
- name: Fix name of static zlib dir
35+
run: ln -s ${{ env.ZLIB_LIB_DIR }}\zlib.lib ${{ env.ZLIB_LIB_DIR }}\zlibstatic.lib
3536
- name: Build and run tests
3637
run: |
3738
mkdir build

0 commit comments

Comments
 (0)