Merge pull request #10054 from ethereum/windowsBuilds

Fix windows builds.

.circleci/config.yml

@@ -910,7 +910,8 @@ jobs:
           keys:
             - dependencies-win-{{ checksum "scripts/install_deps.ps1" }}
       # DO NOT EDIT between here and save_cache, but rather edit .\scripts\install_deps.ps1
-      # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.                                    - run:
+      # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
+      - run:
           name: "Installing dependencies"
           command: .\scripts\install_deps.ps1
       - save_cache:

scripts/install_deps.ps1

@@ -1,9 +1,9 @@
+$ErrorActionPreference = "Stop"
+
+# Needed for Invoke-WebRequest to work via CI.
+$progressPreference = "silentlyContinue"
+
 if ( -not (Test-Path "$PSScriptRoot\..\deps\boost") ) {
-  $ErrorActionPreference = "Stop"
-
-  # Needed for Invoke-WebRequest to work via CI.
-  $progressPreference = "silentlyContinue"
-
   New-Item -ItemType Directory -Force -Path "$PSScriptRoot\..\deps"
 
   Invoke-WebRequest -URI "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win64-x64.zip" -OutFile cmake.zip