From d4b3982cfc70fdfe556603d54a38b3b93ac60fef Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Fri, 12 Feb 2021 09:23:52 +0000 Subject: [PATCH] fix windows ci? --- .github/workflows/ci.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 265768d15..3bbb291bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,23 +23,7 @@ jobs: name: ${{ matrix.target.name }} / ${{ matrix.version }} runs-on: ${{ matrix.target.os }} - # env: - # VCPKG_ROOT: 'C:\vcpkg' - steps: - # - name: Cache vcpkg installed - # uses: actions/cache@v1.0.3 - # if: matrix.target.os == 'windows-latest' - # with: - # path: $VCPKG_ROOT/installed - # key: ${{ runner.os }}-vcpkg-cache - # - name: Cache vcpkg downloads - # uses: actions/cache@v1.0.3 - # if: matrix.target.os == 'windows-latest' - # with: - # path: $VCPKG_ROOT/downloads - # key: ${{ runner.os }}-vcpkg-cache - - name: Install Native Dependencies (Windows) if: matrix.target.os == 'windows-latest' run: | @@ -47,6 +31,10 @@ jobs: 7z x vcpkg.7z -y -bb0 xcopy .\vcpkg $env:VCPKG_INSTALLATION_ROOT /s /e /h /y /q vcpkg integrate install + Copy-Item C:\vcpkg\installed\x64-windows\bin\libcrypto-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libcrypto.dll + Copy-Item C:\vcpkg\installed\x64-windows\bin\libssl-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libssl.dll + Get-ChildItem C:\vcpkg\installed\x64-windows\bin + Get-ChildItem C:\vcpkg\installed\x64-windows\lib echo "VCPKGRS_DYNAMIC=1" >> "$env:GITHUB_ENV" echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" >> "$env:GITHUB_ENV" echo "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\lib" >> "$env:GITHUB_PATH"