[commit: hadrian] master: Remove the hack to use a patched Cabal submodule in CI (#650) (148006a)
git at git.haskell.org
git at git.haskell.org
Sun Aug 5 14:25:33 UTC 2018
Repository : ssh://git@git.haskell.org/hadrian
On branch : master
Link : http://git.haskell.org/hadrian.git/commitdiff/148006a03eae0e91a17d4fd08b541a12fe5ece1b
>---------------------------------------------------------------
commit 148006a03eae0e91a17d4fd08b541a12fe5ece1b
Author: quasicomputational <quasicomputational at gmail.com>
Date: Tue Jul 31 22:45:31 2018 +0100
Remove the hack to use a patched Cabal submodule in CI (#650)
The fix has landed in GHC HEAD.
Closes #634.
>---------------------------------------------------------------
148006a03eae0e91a17d4fd08b541a12fe5ece1b
.travis.yml | 7 -------
appveyor.yml | 7 -------
circle.yml | 4 ----
3 files changed, 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8416e00..f80bca6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/appveyor.yml b/appveyor.yml
index a1ac6c4..1a18abe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
diff --git a/circle.yml b/circle.yml
index 998e46d..10b9094 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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
More information about the ghc-commits
mailing list