diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3945573e..f3f8f7c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,25 @@ jobs: profile: minimal override: true + - name: Install OpenSSL (x64) + if: matrix.target.triple == 'x86_64-pc-windows-msvc' + run: | + vcpkg integrate install + vcpkg install openssl:x64-windows + Get-ChildItem C:\vcpkg\installed\x64-windows\bin + Get-ChildItem C:\vcpkg\installed\x64-windows\lib + 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 + - name: Install OpenSSL (x86) + if: matrix.target.triple == 'i686-pc-windows-msvc' + run: | + vcpkg integrate install + vcpkg install openssl:x86-windows + Get-ChildItem C:\vcpkg\installed\x86-windows\bin + Get-ChildItem C:\vcpkg\installed\x86-windows\lib + Copy-Item C:\vcpkg\installed\x86-windows\bin\libcrypto-1_1.dll C:\vcpkg\installed\x86-windows\bin\libcrypto.dll + Copy-Item C:\vcpkg\installed\x86-windows\bin\libssl-1_1.dll C:\vcpkg\installed\x86-windows\bin\libssl.dll + - name: Install MSYS2 if: matrix.target.triple == 'x86_64-pc-windows-gnu' uses: msys2/setup-msys2@v2 diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 3d6be9ba..4dcf7291 100755 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -62,12 +62,6 @@ webpki-roots = { version = "0.21", optional = true } # native-tls tokio-native-tls = { version = "0.3", optional = true } -[target.'cfg(windows)'.dependencies.tls-openssl] -version = "0.10.9" -package = "openssl" -features = ["vendored"] -optional = true - [dev-dependencies] actix-rt = "2.1.0" actix-server = "2.0.0-beta.3"