Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 259a1c4

Browse files
authored
Merge pull request #1619 from jneira/azure-fix-win-cabal-8.4.4
Fiz Azure job windows-cabal for ghc 8.4.4
2 parents dc03b0b + 9634890 commit 259a1c4

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.azure/windows-cabal.bashrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
export CABAL_DIR="D:\cabal"
12
export GHCS_PATH=$(cygpath $ProgramData)/chocolatey/lib/ghc/tools
23
export GHC_PATH=$GHCS_PATH/ghc-$GHC_VERSION
3-
export CABAL_ROOT=$(cygpath $APPDATA)/cabal
4+
export CABAL_ROOT=$(cygpath $CABAL_DIR)
45
export Z3_BIN_PATH=/usr/local/z3-4.8.5-x64-win/bin
56
export PATH=$CABAL_ROOT/bin:$GHC_PATH/bin:$Z3_BIN_PATH:$PATH

.azure/windows-cabal.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ jobs:
2020
steps:
2121
- task: Cache@2
2222
inputs:
23-
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'
23+
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'
2424
path: .azure-cache
2525
cacheHitVar: CACHE_RESTORED
2626
displayName: "Download cache"
2727
- bash: |
28-
df -k
2928
source .azure/windows-cabal.bashrc
3029
mkdir -p $CABAL_ROOT
31-
tar -vxzf .azure-cache/cabal-root.tar.gz -C /c
30+
tar -vxzf .azure-cache/cabal-root.tar.gz -C /d
3231
mkdir -p $CABAL_STORE_DIR
3332
tar -vxzf .azure-cache/cabal-store.tar.gz -C /d
3433
mkdir -p ${CABAL_STORE_DIR}i
@@ -45,6 +44,7 @@ jobs:
4544
choco install -y --ignore-dependencies ghc --version=$GHC_VERSION
4645
displayName: Install ghc
4746
- bash: |
47+
source .azure/windows-cabal.bashrc
4848
choco install -y cabal --version=$CABAL_VERSION
4949
$(cygpath $ProgramData)/chocolatey/bin/RefreshEnv.cmd
5050
displayName: Install cabal

0 commit comments

Comments
 (0)