diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3231ace62..997f7a6e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,16 +29,16 @@ jobs: runs-on: ${{ matrix.target.os }} steps: - - name: Install Native Dependencies (Windows) - if: matrix.target.os == 'windows-latest' - run: | - curl -fsS -o vcpkg.7z https://rocket.rs/static/vcpkg-2019-07-05.7z - 7z x vcpkg.7z -y -bb0 - xcopy .\vcpkg $env:VCPKG_INSTALLATION_ROOT /s /e /h /y /q - vcpkg integrate install - 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" + # - name: Install Native Dependencies (Windows) + # if: matrix.target.os == 'windows-latest' + # run: | + # curl -fsS -o vcpkg.7z https://rocket.rs/static/vcpkg-2019-07-05.7z + # 7z x vcpkg.7z -y -bb0 + # xcopy .\vcpkg $env:VCPKG_INSTALLATION_ROOT /s /e /h /y /q + # vcpkg integrate install + # 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" - uses: actions/checkout@v2 diff --git a/awc/Cargo.toml b/awc/Cargo.toml index a6da53664..615a76e09 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -60,6 +60,12 @@ serde_urlencoded = "0.7" tls-openssl = { version = "0.10.9", package = "openssl", optional = true } tls-rustls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] } +[target.'cfg(windows)'.dependencies.tls-openssl] +version = "0.10.9" +package = "openssl" +features = ["vendored"] +optional = true + [dev-dependencies] actix-web = { version = "4.0.0-beta.3", features = ["openssl"] } actix-http = { version = "3.0.0-beta.3", features = ["openssl"] }