Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
148006a0
Commit
148006a0
authored
Jul 31, 2018
by
quasicomputational
Committed by
Andrey Mokhov
Jul 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the hack to use a patched Cabal submodule in CI (
#650
)
The fix has landed in GHC HEAD. Closes
#634
.
parent
165f03e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
18 deletions
+0
-18
.travis.yml
.travis.yml
+0
-7
appveyor.yml
appveyor.yml
+0
-7
circle.yml
circle.yml
+0
-4
No files found.
.travis.yml
View file @
148006a0
...
...
@@ -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
...
...
appveyor.yml
View file @
148006a0
...
...
@@ -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
...
...
circle.yml
View file @
148006a0
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment