diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13ca0885c..018f2d324 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 615a76e09..80c02f997 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -60,11 +60,11 @@ 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 +# [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"] }