From f4b1e521ecd52534303042fcda32c8ce0546b621 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 20 Oct 2021 03:02:09 +0100
Subject: [PATCH] put windows openssl install back

---
 .github/workflows/ci.yml | 11 +++++++++++
 CHANGES.md               |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5a71e7ce..faf734e47 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,10 +26,21 @@ jobs:
     env:
       CI: 1
       CARGO_INCREMENTAL: 0
+      VCPKGRS_DYNAMIC: 1
 
     steps:
       - uses: actions/checkout@v2
 
+      # install OpenSSL on Windows
+      # TODO: GitHub actions docs state that OpenSSL is
+      # already installed on these Windows machines somewhere
+      - name: Set vcpkg root
+        if: matrix.target.triple == 'x86_64-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 ${{ matrix.version }}
         uses: actions-rs/toolchain@v1
         with:
diff --git a/CHANGES.md b/CHANGES.md
index a11567d24..a2b6b14ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 ## 4.0.0-beta.10 - 2021-10-20
 ### Added
 * Option to allow `Json` extractor to work without a `Content-Type` header present. [#2362]
+* `#[actix_web::test]` macro for setting up tests with a runtime. [#2409]
 
 ### Changed
 * Associated type `FromRequest::Config` was removed. [#2233]
@@ -21,6 +22,7 @@
 [#2362]: https://github.com/actix/actix-web/pull/2362
 [#2384]: https://github.com/actix/actix-web/pull/2384
 [#2401]: https://github.com/actix/actix-web/pull/2401
+[#2409]: https://github.com/actix/actix-web/pull/2409
 [#2414]: https://github.com/actix/actix-web/pull/2414