Commit 148006a0 authored by quasicomputational's avatar quasicomputational Committed by Andrey Mokhov

Remove the hack to use a patched Cabal submodule in CI (#650)

The fix has landed in GHC HEAD.

Closes #634.
parent 165f03e9
......@@ -104,13 +104,6 @@ install:
- mv .git ghc/hadrian
- cd ghc/hadrian && git reset --hard HEAD && cd ..
# We checkout a patched Cabal.
# See: https://github.com/snowleopard/hadrian/issues/634
- cd libraries/Cabal/
- git remote add quasicomputational https://github.com/quasicomputational/cabal.git
- git fetch quasicomputational && git checkout cwd-independent-check
- cd ../../
cache:
directories:
- $HOME/.cabal
......
......@@ -20,13 +20,6 @@ install:
# Copy new Hadrian into ./ghc/hadrian
- cp -r new-hadrian ghc\hadrian
# We checkout a patched Cabal.
# See: https://github.com/snowleopard/hadrian/issues/634
- cd ghc/libraries/Cabal/
- git remote add quasicomputational https://github.com/quasicomputational/cabal.git
- git fetch quasicomputational && git checkout cwd-independent-check
- cd ../../../
# Install Alex and Happy
- set PATH=C:\Users\appveyor\AppData\Roaming\local\bin;%PATH%
- ghc\hadrian\stack install --install-ghc alex happy > nul
......
......@@ -31,10 +31,6 @@ compile:
# in CircleCI is a separate process, thus you can't "cd" for the other lines
- cd ghc/hadrian; git reset --hard HEAD
# We checkout a patched Cabal.
# See: https://github.com/snowleopard/hadrian/issues/634
- cd ghc/libraries/Cabal/ && git remote add quasicomputational https://github.com/quasicomputational/cabal.git && git fetch quasicomputational && git checkout cwd-independent-check
- cd ghc; ./boot && PATH=~/.cabal/bin:$PATH ./configure
# XXX: export PATH doesn't work well either, so we use inline env
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment