From d2f555910b48b8ba7f517683760715ca680d5169 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 30 Jan 2020 10:09:22 +0100
Subject: [PATCH 1/3] Change cabal root dir to D:

---
 .azure/windows-cabal.bashrc | 3 ++-
 .azure/windows-cabal.yml    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.azure/windows-cabal.bashrc b/.azure/windows-cabal.bashrc
index 7ad443a98..8ddab0325 100644
--- a/.azure/windows-cabal.bashrc
+++ b/.azure/windows-cabal.bashrc
@@ -1,5 +1,6 @@
+export CABAL_DIR=/d/cabal
 export GHCS_PATH=$(cygpath $ProgramData)/chocolatey/lib/ghc/tools
 export GHC_PATH=$GHCS_PATH/ghc-$GHC_VERSION
-export CABAL_ROOT=$(cygpath $APPDATA)/cabal
+export CABAL_ROOT=$CABAL_DIR
 export Z3_BIN_PATH=/usr/local/z3-4.8.5-x64-win/bin
 export PATH=$CABAL_ROOT/bin:$GHC_PATH/bin:$Z3_BIN_PATH:$PATH
diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml
index 38f6c737a..73a16f888 100644
--- a/.azure/windows-cabal.yml
+++ b/.azure/windows-cabal.yml
@@ -25,10 +25,9 @@ jobs:
       cacheHitVar: CACHE_RESTORED
     displayName: "Download cache"
   - bash: |
-      df -k
       source .azure/windows-cabal.bashrc
       mkdir -p $CABAL_ROOT
-      tar -vxzf .azure-cache/cabal-root.tar.gz -C /c
+      tar -vxzf .azure-cache/cabal-root.tar.gz -C /d
       mkdir -p $CABAL_STORE_DIR
       tar -vxzf .azure-cache/cabal-store.tar.gz -C /d
       mkdir -p ${CABAL_STORE_DIR}i
@@ -45,6 +44,7 @@ jobs:
       choco install -y --ignore-dependencies ghc --version=$GHC_VERSION
     displayName: Install ghc
   - bash: |
+      source .azure/windows-cabal.bashrc
       choco install -y cabal --version=$CABAL_VERSION
       $(cygpath $ProgramData)/chocolatey/bin/RefreshEnv.cmd
     displayName: Install cabal

From 44b9f58ecad0bc9b96e6564cc128f33a299e12b5 Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 30 Jan 2020 10:26:55 +0100
Subject: [PATCH 2/3] Use win path in CABAL_DIR

---
 .azure/windows-cabal.bashrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.azure/windows-cabal.bashrc b/.azure/windows-cabal.bashrc
index 8ddab0325..1a8b40489 100644
--- a/.azure/windows-cabal.bashrc
+++ b/.azure/windows-cabal.bashrc
@@ -1,6 +1,6 @@
-export CABAL_DIR=/d/cabal
+export CABAL_DIR="D:\cabal"
 export GHCS_PATH=$(cygpath $ProgramData)/chocolatey/lib/ghc/tools
 export GHC_PATH=$GHCS_PATH/ghc-$GHC_VERSION
-export CABAL_ROOT=$CABAL_DIR
+export CABAL_ROOT=$(cygpath $CABAL_DIR)
 export Z3_BIN_PATH=/usr/local/z3-4.8.5-x64-win/bin
 export PATH=$CABAL_ROOT/bin:$GHC_PATH/bin:$Z3_BIN_PATH:$PATH

From 9634890b8434476f7d2891c4f2fe8a2dbc3545fc Mon Sep 17 00:00:00 2001
From: jneira <atreyu.bbb@gmail.com>
Date: Thu, 30 Jan 2020 13:37:08 +0100
Subject: [PATCH 3/3] Refresh cache of windows-cabal job

---
 .azure/windows-cabal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml
index 73a16f888..7abbe3926 100644
--- a/.azure/windows-cabal.yml
+++ b/.azure/windows-cabal.yml
@@ -20,7 +20,7 @@ jobs:
   steps:
   - task: Cache@2
     inputs:
-      key: '"cabal" | "$(Agent.OS)" | "$(CABAL_VERSION)" | "$(GHC_VERSION)" | $(Build.SourcesDirectory)/cabal.project | $(Build.SourcesDirectory)/haskell-ide-engine.cabal | $(Build.SourcesDirectory)/hie-plugin-api/hie-plugin-api.cabal'
+      key: '"cabal-v2" | "$(Agent.OS)" | "$(CABAL_VERSION)" | "$(GHC_VERSION)" | $(Build.SourcesDirectory)/cabal.project | $(Build.SourcesDirectory)/haskell-ide-engine.cabal | $(Build.SourcesDirectory)/hie-plugin-api/hie-plugin-api.cabal'
       path: .azure-cache
       cacheHitVar: CACHE_RESTORED
     displayName: "Download cache"