From 8e42015dd363910274ec27d922dc59a92f4e0a1f Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Fri, 16 Oct 2020 11:42:20 +0200 Subject: [PATCH] Fix windows builds. --- .circleci/config.yml | 3 ++- scripts/install_deps.ps1 | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 851bcc4c5..c3a771e0c 100644 --- a/.circleci/config.yml +++ b/.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: diff --git a/scripts/install_deps.ps1 b/scripts/install_deps.ps1 index b16529f8e..ca204729d 100644 --- a/scripts/install_deps.ps1 +++ b/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