Remove the hack to use a patched Cabal submodule in CI (#650)
authorquasicomputational <quasicomputational@gmail.com>
Tue, 31 Jul 2018 21:45:31 +0000 (22:45 +0100)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Tue, 31 Jul 2018 21:45:31 +0000 (22:45 +0100)
The fix has landed in GHC HEAD.

Closes #634.

.travis.yml
appveyor.yml
circle.yml

index 8416e00..f80bca6 100644 (file)
@@ -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
index a1ac6c4..1a18abe 100644 (file)
@@ -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
index 998e46d..10b9094 100644 (file)
@@ -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