diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b5b47c408..2bb9a234ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,9 @@ jobs: name: ${{ matrix.target.name }} / ${{ matrix.version }} runs-on: ${{ matrix.target.os }} + env: + VCPKGRS_DYNAMIC: 1 + steps: - name: Setup Routing if: matrix.target.os == 'macos-latest' @@ -32,6 +35,17 @@ jobs: - uses: actions/checkout@v2 + # install OpenSSL on Windows + - name: Set vcpkg root + if: matrix.target.triple == 'x86_64-pc-windows-msvc' || matrix.target.triple == 'i686-pc-windows-msvc' + run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append + - name: Install OpenSSL + if: matrix.target.triple == 'x86_64-pc-windows-msvc' + run: vcpkg install openssl:x64-windows + - name: Install OpenSSL + if: matrix.target.triple == 'i686-pc-windows-msvc' + run: vcpkg install openssl:x86-windows + - name: Install ${{ matrix.version }} uses: actions-rs/toolchain@v1 with: diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 354bb42875..d14c65ac46 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"