From 4ef6d0fc3623f80e9b8526f821cc715354cc60bd Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Wed, 6 Nov 2024 11:03:28 -0600 Subject: [PATCH] Fixing all the paths to follow cmake conventions --- .github/workflows/test.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 47f0d2087..0b2dc7061 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,12 +5,12 @@ jobs: name: Build and test driver on windows-2022 runs-on: windows-2019 env: - CASS_DRIVER_LIBEV_INCLUDES: C:\vcpkg\packages\libev_x64-windows\include\libev - CASS_DRIVER_LIBEV_LIBS: C:\vcpkg\packages\libev_x64-windows\lib - LIBUV_ROOT_DIR: C:\vcpkg\packages\libuv_x64-windows - ZLIB_ROOT_DIR: C:\vcpkg\packages\zlib_x64-windows-static - KERBEROS_ROOT_DIR: C:\vcpkg\packages\krb5_x64-windows - OPENSSL_ROOT_DIR: C:\vcpkg\packages\openssl_x64-windows + CASS_DRIVER_LIBEV_INCLUDES: C:/vcpkg/packages/libev_x64-windows/include/libev + CASS_DRIVER_LIBEV_LIBS: C:/vcpkg/packages/libev_x64-windows/lib + LIBUV_ROOT_DIR: C:/vcpkg/packages/libuv_x64-windows + ZLIB_ROOT_DIR: C:/vcpkg/packages/zlib_x64-windows-static + KERBEROS_ROOT_DIR: C:/vcpkg/packages/krb5_x64-windows + OPENSSL_ROOT_DIR: C:/vcpkg/packages/openssl_x64-windows steps: - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 @@ -18,17 +18,16 @@ jobs: run: vcpkg install libuv zlib:x64-windows-static krb5 openssl - name: Setup env vars run: | - echo "ZLIB_LIB_DIR=${{ env.ZLIB_ROOT_DIR }}\lib" >> $env:GITHUB_ENV - echo "LIBUV_BIN_DIR=${{ env.LIBUV_ROOT_DIR }}\bin" >> $env:GITHUB_ENV - echo "KERBEROS_BIN_DIR=${{ env.KERBEROS_ROOT_DIR }}\bin" >> $env:GITHUB_ENV - echo "OPENSSL_BIN_DIR=${{ env.OPENSSL_ROOT_DIR }}\bin" >> $env:GITHUB_ENV - echo "OPENSSL_INCLUDE_DIR=${{ env.OPENSSL_ROOT_DIR }}\include" >> $env:GITHUB_ENV - echo "OPENSSL_APPLINK_DIR=C:/vcpkg/packages/openssl_x64-windows/include/openssl" >> $env:GITHUB_ENV + echo "ZLIB_LIB_DIR=${{ env.ZLIB_ROOT_DIR }}/lib" >> $env:GITHUB_ENV + echo "LIBUV_BIN_DIR=${{ env.LIBUV_ROOT_DIR }}/bin" >> $env:GITHUB_ENV + echo "KERBEROS_BIN_DIR=${{ env.KERBEROS_ROOT_DIR }}/bin" >> $env:GITHUB_ENV + echo "OPENSSL_BIN_DIR=${{ env.OPENSSL_ROOT_DIR }}/bin" >> $env:GITHUB_ENV + echo "OPENSSL_APPLINK_DIR=${{ env.OPENSSL_ROOT_DIR }}/include/openssl" >> $env:GITHUB_ENV - name: Set PATH to find vcpkg dependencies run: | echo "PATH=${{ env.PATH }};${{ env.LIBUV_BIN_DIR }};${{ env.KERBEROS_BIN_DIR }};${{ env.OPENSSL_BIN_DIR }}" >> $env:GITHUB_ENV - name: Fix name of static zlib dir - run: ln -s ${{ env.ZLIB_LIB_DIR }}\zlib.lib ${{ env.ZLIB_LIB_DIR }}\zlibstatic.lib + run: ln -s ${{ env.ZLIB_LIB_DIR }}/zlib.lib ${{ env.ZLIB_LIB_DIR }}/zlibstatic.lib - name: Build and run tests run: | mkdir build