Fixing all the paths to follow cmake conventions

datastax · Nov 6, 2024 · 4ef6d0f · 4ef6d0f
1 parent 7645557
commit 4ef6d0f
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,30 +5,29 @@ 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
       - name: Install dependencies
         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