diff --git a/.azure/windows-cabal.bashrc b/.azure/windows-cabal.bashrc index 1a8b40489..8636283cd 100644 --- a/.azure/windows-cabal.bashrc +++ b/.azure/windows-cabal.bashrc @@ -1,4 +1,3 @@ -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 $CABAL_DIR) diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml index 7abbe3926..18948e7ee 100644 --- a/.azure/windows-cabal.yml +++ b/.azure/windows-cabal.yml @@ -14,6 +14,7 @@ jobs: GHC_VERSION: "8.4.4" variables: CABAL_VERSION: "3.0.0.0" + CABAL_DIR: "D:\\cabal" CABAL_STORE_DIR: "D:\\sd" LIQUID_VERSION: "0.8.6.2" STACK_ROOT: "D:\\sr" diff --git a/.azure/windows-installhs-cabal.yml b/.azure/windows-installhs-cabal.yml index 16bd6d439..750f6819e 100644 --- a/.azure/windows-installhs-cabal.yml +++ b/.azure/windows-installhs-cabal.yml @@ -6,8 +6,9 @@ jobs: variables: GHC_VERSION: "8.6.5" CABAL_VERSION: "3.0.0.0" - PROJECT_FILE: "./install/shake.project" + CABAL_DIR: "" # To use the default one (cabal-hie-install latest fails with a custom one) CABAL_STORE_DIR: "D:\\sd" + PROJECT_FILE: "./install/shake.project" steps: - task: Cache@2 inputs: @@ -18,7 +19,7 @@ jobs: - bash: | 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 ./dist-newstyle